diff options
| author |   Cedric Ollivier <ollivier.cedric@gmail.com> | 2017-03-28 08:12:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-28 08:12:15 +0000 |
| commit | 514c97b036cf968e03e600a4761757448bef0a0a (patch) | |
| tree | 1c26ce72ed668b8e183da925d7b5bced89445e22 /functest/opnfv_tests/sdn | |
| parent | 5af67bcca589c275b73fe5e4bca9bea5871948aa (diff) | |
| parent | 407d27585f109e3381bb49041abc49a14b7b5bfe (diff) | |
Merge "Switch TestcaseBase to TestCase"
Diffstat (limited to 'functest/opnfv_tests/sdn')
| -rwxr-xr-x | functest/opnfv_tests/sdn/odl/odl.py | 8 | ||||
| -rw-r--r-- | functest/opnfv_tests/sdn/onos/onos.py | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py index c8e9c492..3d6be9a8 100755 --- a/functest/opnfv_tests/sdn/odl/odl.py +++ b/functest/opnfv_tests/sdn/odl/odl.py @@ -46,7 +46,7 @@ class ODLResultVisitor(robot.api.ResultVisitor): return self._data -class ODLTests(testcase_base.TestcaseBase): +class ODLTests(testcase_base.TestCase): repos = "/home/opnfv/repos/" odl_test_repo = os.path.join(repos, "odl_test") @@ -59,7 +59,7 @@ class ODLTests(testcase_base.TestcaseBase): logger = ft_logger.Logger("opendaylight").getLogger() def __init__(self): - testcase_base.TestcaseBase.__init__(self) + testcase_base.TestCase.__init__(self) self.case_name = "odl" @classmethod @@ -236,9 +236,9 @@ if __name__ == '__main__': args = parser.parse_args(sys.argv[1:]) try: result = odl.main(ODLTests.default_suites, **args) - if result != testcase_base.TestcaseBase.EX_OK: + if result != testcase_base.TestCase.EX_OK: sys.exit(result) if args['pushtodb']: sys.exit(odl.push_to_db()) except Exception: - sys.exit(testcase_base.TestcaseBase.EX_RUN_ERROR) + sys.exit(testcase_base.TestCase.EX_RUN_ERROR) diff --git a/functest/opnfv_tests/sdn/onos/onos.py b/functest/opnfv_tests/sdn/onos/onos.py index 8bc73832..5764bdee 100644 --- a/functest/opnfv_tests/sdn/onos/onos.py +++ b/functest/opnfv_tests/sdn/onos/onos.py @@ -24,7 +24,7 @@ import functest.utils.openstack_utils as openstack_utils logger = ft_logger.Logger(__name__).getLogger() -class OnosBase(testcase_base.TestcaseBase): +class OnosBase(testcase_base.TestCase): onos_repo_path = CONST.dir_repo_onos onos_sfc_image_name = CONST.onos_sfc_image_name onos_sfc_image_path = os.path.join(CONST.dir_functest_data, @@ -39,10 +39,10 @@ class OnosBase(testcase_base.TestcaseBase): self.start_time = time.time() try: self._run() - res = testcase_base.TestcaseBase.EX_OK + res = testcase_base.TestCase.EX_OK except Exception as e: logger.error('Error with run: %s', e) - res = testcase_base.TestcaseBase.EX_RUN_ERROR + res = testcase_base.TestCase.EX_RUN_ERROR self.stop_time = time.time() return res |