Conform SFC test case to FeatureBase

[functest.git] / functest / opnfv_tests / features / sdnvpn.py

diff --git a/functest/opnfv_tests/features/sdnvpn.py b/functest/opnfv_tests/features/sdnvpn.py
index 567b5fb..451299e 100644 (file)
--- a/functest/opnfv_tests/features/sdnvpn.py
+++ b/functest/opnfv_tests/features/sdnvpn.py
@@ -14,13 +14,13 @@ import os
 import sys
 import time
 
-from functest.core import TestCasesBase
+import functest.core.testcase_base as testcase_base
 import functest.utils.functest_constants as ft_constants
 import functest.utils.functest_logger as ft_logger
 import functest.utils.functest_utils as ft_utils
 
 
-class SdnVpnTests(TestCasesBase.TestCasesBase):
+class SdnVpnTests(testcase_base.TestcaseBase):
     SDNVPN_REPO_TESTS = os.path.join(
         ft_constants.SDNVPN_REPO_DIR, "tests/functest")
     logger = ft_logger.Logger("sdnvpn").getLogger()
@@ -41,28 +41,24 @@ class SdnVpnTests(TestCasesBase.TestCasesBase):
                                        output_file=log_file)
 
         stop_time = time.time()
-        duration = round(stop_time - start_time, 1)
-        if ret == 0 and duration > 1:
+        if ret == 0:
             self.logger.info("%s OK" % self.case_name)
             status = 'PASS'
-        elif ret == 0 and duration <= 1:
-            self.logger.info("%s TEST SKIPPED" % self.case_name)
-            status = 'SKIP'
         else:
             self.logger.info("%s FAILED" % self.case_name)
             status = "FAIL"
 
         # report status only if tests run (FAIL OR PASS)
-        if status is not "SKIP":
-            self.criteria = status
-            self.start_time = start_time
-            self.stop_time = stop_time
-            self.details = {}
+        self.criteria = status
+        self.start_time = start_time
+        self.stop_time = stop_time
+        self.details = {}
 
     def run(self):
         kwargs = {}
         return self.main(**kwargs)
 
+
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
     parser.add_argument("-r", "--report",
@@ -72,9 +68,9 @@ if __name__ == '__main__':
     sdnvpn = SdnVpnTests()
     try:
         result = sdnvpn.main(**args)
-        if result != TestCasesBase.TestCasesBase.EX_OK:
+        if result != testcase_base.TestcaseBase.EX_OK:
             sys.exit(result)
         if args['report']:
             sys.exit(sdnvpn.push_to_db())
     except Exception:
-        sys.exit(TestCasesBase.TestCasesBase.EX_RUN_ERROR)
+        sys.exit(testcase_base.TestcaseBase.EX_RUN_ERROR)