diff options
Diffstat (limited to 'functest/opnfv_tests/features')
| -rwxr-xr-x | functest/opnfv_tests/features/domino.py | 15 | ||||
| -rw-r--r-- | functest/opnfv_tests/features/sdnvpn.py | 14 |
2 files changed, 15 insertions, 14 deletions
diff --git a/functest/opnfv_tests/features/domino.py b/functest/opnfv_tests/features/domino.py index 2deeb4c4..942b474f 100755 --- a/functest/opnfv_tests/features/domino.py +++ b/functest/opnfv_tests/features/domino.py @@ -15,6 +15,7 @@ # 0.4: refactoring to match Test abstraction class import argparse +import os import sys import time @@ -24,19 +25,19 @@ import functest.utils.functest_utils as ft_utils import functest.utils.functest_constants as ft_constants -class DominoCases(TestCasesBase.TestCasesBase): - DOMINO_REPO = ft_constants.DOMINO_REPO - RESULTS_DIR = ft_constants.FUNCTEST_RESULTS_DIR +class DominoTests(TestCasesBase.TestCasesBase): logger = ft_logger.Logger("domino").getLogger() def __init__(self): - super(DominoCases, self).__init__() + super(DominoTests, self).__init__() self.project_name = "domino" self.case_name = "domino-multinode" def main(self, **kwargs): - cmd = 'cd %s && ./tests/run_multinode.sh' % self.DOMINO_REPO - log_file = self.RESULTS_DIR + "/domino.log" + cmd = ('cd %s && ./tests/run_multinode.sh' % + ft_constants.DOMINO_REPO_DIR) + log_file = os.path.join( + ft_constants.FUNCTEST_RESULTS_DIR, "domino.log") start_time = time.time() ret = ft_utils.execute_command(cmd, @@ -72,7 +73,7 @@ if __name__ == '__main__': help="Create json result file", action="store_true") args = vars(parser.parse_args()) - domino = DominoCases() + domino = DominoTests() try: result = domino.main(**args) if result != TestCasesBase.TestCasesBase.EX_OK: diff --git a/functest/opnfv_tests/features/sdnvpn.py b/functest/opnfv_tests/features/sdnvpn.py index efc67b09..567b5fbc 100644 --- a/functest/opnfv_tests/features/sdnvpn.py +++ b/functest/opnfv_tests/features/sdnvpn.py @@ -20,21 +20,21 @@ import functest.utils.functest_logger as ft_logger import functest.utils.functest_utils as ft_utils -class SDNVPN(TestCasesBase.TestCasesBase): - SDNVPN_REPO = ft_constants.SDNVPN_REPO_DIR - SDNVPN_REPO_TESTS = os.path.join(SDNVPN_REPO, "tests/functest") - RESULTS_DIR = ft_constants.FUNCTEST_RESULTS_DIR +class SdnVpnTests(TestCasesBase.TestCasesBase): + SDNVPN_REPO_TESTS = os.path.join( + ft_constants.SDNVPN_REPO_DIR, "tests/functest") logger = ft_logger.Logger("sdnvpn").getLogger() def __init__(self): - super(SDNVPN, self).__init__() + super(SdnVpnTests, self).__init__() self.project_name = "sdnvpn" self.case_name = "bgpvpn" def main(self, **kwargs): os.chdir(self.SDNVPN_REPO_TESTS) cmd = 'run_tests.py' - log_file = os.path.join(self.RESULTS_DIR, "sdnvpn.log") + log_file = os.path.join( + ft_constants.FUNCTEST_RESULTS_DIR, "sdnvpn.log") start_time = time.time() ret = ft_utils.execute_command(cmd, @@ -69,7 +69,7 @@ if __name__ == '__main__': help="Create json result file", action="store_true") args = vars(parser.parse_args()) - sdnvpn = SDNVPN() + sdnvpn = SdnVpnTests() try: result = sdnvpn.main(**args) if result != TestCasesBase.TestCasesBase.EX_OK: |