Convert to Unix format 41/18841/1
authorCédric Ollivier <cedric.ollivier@orange.com>
Wed, 17 Aug 2016 13:42:00 +0000 (15:42 +0200)
committerCédric Ollivier <cedric.ollivier@orange.com>
Wed, 17 Aug 2016 13:42:00 +0000 (15:42 +0200)
Change-Id: I3ddb9c38010c6f19ebd507990b57c9c498f49da8
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
testcases/features/copper.py

index 74ef439..c312643 100755 (executable)
@@ -1,85 +1,85 @@
-#!/usr/bin/python\r
-#\r
-# Copyright 2016 AT&T Intellectual Property, Inc\r
-#\r
-# Licensed under the Apache License, Version 2.0 (the "License");\r
-# you may not use this file except in compliance with the License.\r
-# You may obtain a copy of the License at\r
-#\r
-# http://www.apache.org/licenses/LICENSE-2.0\r
-#\r
-# Unless required by applicable law or agreed to in writing, software\r
-# distributed under the License is distributed on an "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-# See the License for the specific language governing permissions and\r
-# limitations under the License.\r
-#\r
-import argparse\r
-import os\r
-import sys\r
-import time\r
-import functest.utils.functest_logger as ft_logger\r
-import functest.utils.functest_utils as functest_utils\r
-import yaml\r
-\r
-parser = argparse.ArgumentParser()\r
-parser.add_argument("-r", "--report",\r
-                    help="Create json result file",\r
-                    action="store_true")\r
-args = parser.parse_args()\r
-\r
-with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f:\r
-    functest_yaml = yaml.safe_load(f)\r
-\r
-dirs = functest_yaml.get('general').get('directories')\r
-FUNCTEST_REPO = dirs.get('dir_repo_functest')\r
-COPPER_REPO = dirs.get('dir_repo_copper')\r
-\r
-logger = ft_logger.Logger("copper").getLogger()\r
-\r
-\r
-def main():\r
-    cmd = "%s/tests/run.sh %s/tests" % (COPPER_REPO, COPPER_REPO)\r
-\r
-    start_time = time.time()\r
-\r
-    ret_val = functest_utils.execute_command(cmd, logger, exit_on_error=False)\r
-\r
-    stop_time = time.time()\r
-    duration = round(stop_time - start_time, 1)\r
-    if ret_val == 0:\r
-        logger.info("COPPER PASSED")\r
-        test_status = 'PASS'\r
-    else:\r
-        logger.info("COPPER FAILED")\r
-        test_status = 'FAIL'\r
-\r
-    details = {\r
-        'timestart': start_time,\r
-        'duration': duration,\r
-        'status': test_status,\r
-    }\r
-    functest_utils.logger_test_results(logger, "Copper",\r
-                                       "copper-notification",\r
-                                       details['status'], details)\r
-    try:\r
-        if args.report:\r
-            functest_utils.push_results_to_db("copper",\r
-                                              "copper-notification",\r
-                                              logger,\r
-                                              start_time,\r
-                                              stop_time,\r
-                                              details['status'],\r
-                                              details)\r
-            logger.info("COPPER results pushed to DB")\r
-    except:\r
-        logger.error("Error pushing results into Database '%s'"\r
-                     % sys.exc_info()[0])\r
-\r
-    if ret_val != 0:\r
-        sys.exit(-1)\r
-\r
-    sys.exit(0)\r
-\r
-if __name__ == '__main__':\r
-    main()\r
+#!/usr/bin/python
+#
+# Copyright 2016 AT&T Intellectual Property, Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+import argparse
+import os
+import sys
+import time
+import functest.utils.functest_logger as ft_logger
+import functest.utils.functest_utils as functest_utils
+import yaml
+
+parser = argparse.ArgumentParser()
+parser.add_argument("-r", "--report",
+                    help="Create json result file",
+                    action="store_true")
+args = parser.parse_args()
+
+with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f:
+    functest_yaml = yaml.safe_load(f)
+
+dirs = functest_yaml.get('general').get('directories')
+FUNCTEST_REPO = dirs.get('dir_repo_functest')
+COPPER_REPO = dirs.get('dir_repo_copper')
+
+logger = ft_logger.Logger("copper").getLogger()
+
+
+def main():
+    cmd = "%s/tests/run.sh %s/tests" % (COPPER_REPO, COPPER_REPO)
+
+    start_time = time.time()
+
+    ret_val = functest_utils.execute_command(cmd, logger, exit_on_error=False)
+
+    stop_time = time.time()
+    duration = round(stop_time - start_time, 1)
+    if ret_val == 0:
+        logger.info("COPPER PASSED")
+        test_status = 'PASS'
+    else:
+        logger.info("COPPER FAILED")
+        test_status = 'FAIL'
+
+    details = {
+        'timestart': start_time,
+        'duration': duration,
+        'status': test_status,
+    }
+    functest_utils.logger_test_results(logger, "Copper",
+                                       "copper-notification",
+                                       details['status'], details)
+    try:
+        if args.report:
+            functest_utils.push_results_to_db("copper",
+                                              "copper-notification",
+                                              logger,
+                                              start_time,
+                                              stop_time,
+                                              details['status'],
+                                              details)
+            logger.info("COPPER results pushed to DB")
+    except:
+        logger.error("Error pushing results into Database '%s'"
+                     % sys.exc_info()[0])
+
+    if ret_val != 0:
+        sys.exit(-1)
+
+    sys.exit(0)
+
+if __name__ == '__main__':
+    main()