Speed up functional tests execution

[transportpce.git] / tests / transportpce_tests / tapi / test02_full_topology.py

diff --git a/tests/transportpce_tests/tapi/test02_full_topology.py b/tests/transportpce_tests/tapi/test02_full_topology.py
index 0ab966b85308ba1cbf70263bebaca5a63326904b..c8d79a78ca599e83a4d24492c452cec7de2c862b 100644 (file)
--- a/tests/transportpce_tests/tapi/test02_full_topology.py
+++ b/tests/transportpce_tests/tapi/test02_full_topology.py
@@ -104,18 +104,17 @@ class TransportPCEtesting(unittest.TestCase):
         os.environ['JAVA_MAX_MEM'] = '4096M'
         cls.processes = test_utils.start_tpce()
         # TAPI feature is not installed by default in Karaf
-# FIXME: https://jira.opendaylight.org/browse/TRNSPRTPCE-701
-#        if "USE_LIGHTY" not in os.environ or os.environ['USE_LIGHTY'] != 'True':
-#            print("installing tapi feature...")
-#            result = test_utils.install_karaf_feature("odl-transportpce-tapi")
-#            if result.returncode != 0:
-#                cls.init_failed = True
-#            print("Restarting OpenDaylight...")
-#            test_utils.shutdown_process(cls.processes[0])
-#            cls.processes[0] = test_utils.start_karaf()
-#            test_utils.process_list[0] = cls.processes[0]
-#            cls.init_failed = not test_utils.wait_until_log_contains(
-#                test_utils.KARAF_LOG, test_utils.KARAF_OK_START_MSG, time_to_wait=60)
+        if "NO_ODL_STARTUP" not in os.environ or "USE_LIGHTY" not in os.environ or os.environ['USE_LIGHTY'] != 'True':
+            print("installing tapi feature...")
+            result = test_utils.install_karaf_feature("odl-transportpce-tapi")
+            if result.returncode != 0:
+                cls.init_failed = True
+            print("Restarting OpenDaylight...")
+            test_utils.shutdown_process(cls.processes[0])
+            cls.processes[0] = test_utils.start_karaf()
+            test_utils.process_list[0] = cls.processes[0]
+            cls.init_failed = not test_utils.wait_until_log_contains(
+                test_utils.KARAF_LOG, test_utils.KARAF_OK_START_MSG, time_to_wait=60)
         if cls.init_failed:
             print("tapi installation feature failed...")
             test_utils.shutdown_process(cls.processes[0])
@@ -133,7 +132,7 @@ class TransportPCEtesting(unittest.TestCase):
         print("all processes killed")
 
     def setUp(self):
-        time.sleep(5)
+        time.sleep(2)
 
     def test_01_connect_spdrA(self):
         print("Connecting SPDRA")