From c9f92317cf20465987ff187733dd620e8d1fdc4f Mon Sep 17 00:00:00 2001 From: Vincent Danno Date: Tue, 18 May 2021 21:17:41 +0200 Subject: Use constants instead of hard-coding paths This complements https://gerrit.opnfv.org/gerrit/c/functest-xtesting/+/72495 which missed one occurence due to trailing slash difference. Signed-off-by: Vincent Danno Change-Id: Iabfa89161cc099c924a7609aeb4ef6ed1b027cd3 --- xtesting/core/testcase.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'xtesting/core') 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 " @@ -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: -- cgit 1.2.3-korg