diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2021-05-25 12:00:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2021-05-25 12:00:54 +0000 |
| commit | 562b808d7cf350e3a56cbfbd02352d40f67ed64f (patch) | |
| tree | ea367ee9465282e2ac4e699e366595b7ed85dc3a | |
| parent | aff374413e80501108a619141b636c127b4905cb (diff) | |
| parent | c9f92317cf20465987ff187733dd620e8d1fdc4f (diff) | |
Merge "Use constants instead of hard-coding paths"
| -rw-r--r-- | xtesting/core/testcase.py | 9 | ||||
| -rw-r--r-- | xtesting/utils/constants.py | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/xtesting/core/testcase.py b/xtesting/core/testcase.py index 8faf3f43..08ce426b 100644 --- a/xtesting/core/testcase.py +++ b/xtesting/core/testcase.py @@ -28,6 +28,7 @@ from six.moves import urllib from xtesting.utils import decorators from xtesting.utils import env +from xtesting.utils import constants __author__ = "Cedric Ollivier <cedric.ollivier@orange.com>" @@ -55,7 +56,7 @@ class TestCase(): EX_PUBLISH_ARTIFACTS_ERROR = os.EX_SOFTWARE - 4 """publish_artifacts() failed""" - dir_results = "/var/lib/xtesting/results" + dir_results = constants.RESULTS_DIR _job_name_rule = "(dai|week)ly-(.+?)-[0-9]*" headers = {'Content-Type': 'application/json'} __logger = logging.getLogger(__name__) @@ -69,9 +70,9 @@ class TestCase(): self.start_time = 0 self.stop_time = 0 self.is_skipped = False - self.output_log_name = 'xtesting.log' - self.output_debug_log_name = 'xtesting.debug.log' - self.res_dir = "{}/{}".format(self.dir_results, self.case_name) + self.output_log_name = os.path.basename(constants.LOG_PATH) + self.output_debug_log_name = os.path.basename(constants.DEBUG_LOG_PATH) + self.res_dir = os.path.join(self.dir_results, self.case_name) def __str__(self): try: diff --git a/xtesting/utils/constants.py b/xtesting/utils/constants.py index 7677f2e5..acd0d31d 100644 --- a/xtesting/utils/constants.py +++ b/xtesting/utils/constants.py @@ -6,7 +6,7 @@ import os ENV_FILE = '/var/lib/xtesting/conf/env_file' -RESULTS_DIR = '/var/lib/xtesting/results/' +RESULTS_DIR = '/var/lib/xtesting/results' LOG_PATH = os.path.join(RESULTS_DIR, 'xtesting.log') DEBUG_LOG_PATH = os.path.join(RESULTS_DIR, 'xtesting.debug.log') |