diff options
| author |   jose.lausuch <jose.lausuch@ericsson.com> | 2016-11-24 23:24:49 +0100 |
|---|---|---|
| committer | jose.lausuch <jose.lausuch@ericsson.com> | 2016-11-25 16:41:59 +0100 |
| commit | 0ef5ea9304d2e848581ebefe7ac6c4bd4fb7f507 (patch) | |
| tree | b520aa94d15927342544c2520be0e67ab9a05b69 /functest/opnfv_tests/features | |
| parent | 165ff17205d99b18df36e5ac6f34ede858e3da17 (diff) | |
Add suffix '_DIR' to some constants that point to directories
JIRA: FUNCTEST-533
Change-Id: Iea2ca0709f6e53201056f9145fa6020216c31f56
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
Diffstat (limited to 'functest/opnfv_tests/features')
| -rwxr-xr-x | functest/opnfv_tests/features/domino.py | 9 | ||||
| -rw-r--r-- | functest/opnfv_tests/features/sdnvpn.py | 8 |
2 files changed, 9 insertions, 8 deletions
diff --git a/functest/opnfv_tests/features/domino.py b/functest/opnfv_tests/features/domino.py index 30d33a13..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 @@ -25,8 +26,6 @@ import functest.utils.functest_constants as ft_constants class DominoTests(TestCasesBase.TestCasesBase): - DOMINO_REPO = ft_constants.DOMINO_REPO - RESULTS_DIR = ft_constants.FUNCTEST_RESULTS_DIR logger = ft_logger.Logger("domino").getLogger() def __init__(self): @@ -35,8 +34,10 @@ class DominoTests(TestCasesBase.TestCasesBase): 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, diff --git a/functest/opnfv_tests/features/sdnvpn.py b/functest/opnfv_tests/features/sdnvpn.py index 719d4fbf..567b5fbc 100644 --- a/functest/opnfv_tests/features/sdnvpn.py +++ b/functest/opnfv_tests/features/sdnvpn.py @@ -21,9 +21,8 @@ import functest.utils.functest_utils as ft_utils class SdnVpnTests(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 + SDNVPN_REPO_TESTS = os.path.join( + ft_constants.SDNVPN_REPO_DIR, "tests/functest") logger = ft_logger.Logger("sdnvpn").getLogger() def __init__(self): @@ -34,7 +33,8 @@ class SdnVpnTests(TestCasesBase.TestCasesBase): 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, |