From: Vincent Danno Date: Mon, 10 May 2021 09:27:15 +0000 (+0200) Subject: Use constants instead of hard-coding paths X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F95%2F72495%2F4;p=functest-xtesting.git Use constants instead of hard-coding paths Signed-off-by: Vincent Danno Change-Id: I9bef7db7584d6b615ef102d13797914095512733 --- diff --git a/xtesting/ci/run_tests.py b/xtesting/ci/run_tests.py index ea606bd4..989969bc 100644 --- a/xtesting/ci/run_tests.py +++ b/xtesting/ci/run_tests.py @@ -308,17 +308,17 @@ class Runner(): def main(): """Entry point""" try: - os.makedirs('/var/lib/xtesting/results/') + os.makedirs(constants.RESULTS_DIR) except OSError as ex: if ex.errno != errno.EEXIST: - six.print_("Cannot create /var/lib/xtesting/results/") + six.print_("{} {}".format("Cannot create", constants.RESULTS_DIR)) return testcase.TestCase.EX_RUN_ERROR if env.get('DEBUG').lower() == 'true': logging.config.fileConfig(pkg_resources.resource_filename( - 'xtesting', 'ci/logging.debug.ini')) + 'xtesting', constants.DEBUG_INI_PATH)) else: logging.config.fileConfig(pkg_resources.resource_filename( - 'xtesting', 'ci/logging.ini')) + 'xtesting', constants.INI_PATH)) logging.captureWarnings(True) parser = RunTestsParser() args = parser.parse_args(sys.argv[1:]) diff --git a/xtesting/core/campaign.py b/xtesting/core/campaign.py index 7c766e53..51a145c1 100644 --- a/xtesting/core/campaign.py +++ b/xtesting/core/campaign.py @@ -26,6 +26,7 @@ from six.moves import urllib from xtesting.core import testcase from xtesting.utils import env +from xtesting.utils import constants __author__ = "Cedric Ollivier " @@ -216,9 +217,9 @@ def main(): os.makedirs(testcase.TestCase.dir_results) if env.get('DEBUG').lower() == 'true': logging.config.fileConfig(pkg_resources.resource_filename( - 'xtesting', 'ci/logging.debug.ini')) + 'xtesting', constants.DEBUG_INI_PATH)) else: logging.config.fileConfig(pkg_resources.resource_filename( - 'xtesting', 'ci/logging.ini')) + 'xtesting', constants.INI_PATH)) logging.captureWarnings(True) Campaign.zip_campaign_files() diff --git a/xtesting/tests/unit/core/test_feature.py b/xtesting/tests/unit/core/test_feature.py index 785f6e16..ab483b27 100644 --- a/xtesting/tests/unit/core/test_feature.py +++ b/xtesting/tests/unit/core/test_feature.py @@ -9,6 +9,8 @@ # pylint: disable=missing-docstring +import os + import logging import subprocess import unittest @@ -18,6 +20,7 @@ import six from xtesting.core import feature from xtesting.core import testcase +from xtesting.utils import constants class FakeTestCase(feature.Feature): @@ -40,7 +43,7 @@ class FeatureTestingBase(unittest.TestCase): _project_name = "bar" _repo = "dir_repo_bar" _cmd = "run_bar_tests.py" - _output_file = '/var/lib/xtesting/results/foo/foo.log' + _output_file = os.path.join(constants.RESULTS_DIR, 'foo/foo.log') feature = None @mock.patch('time.time', side_effect=[1, 2]) diff --git a/xtesting/tests/unit/core/test_testcase.py b/xtesting/tests/unit/core/test_testcase.py index 63bfc3fe..990883c6 100644 --- a/xtesting/tests/unit/core/test_testcase.py +++ b/xtesting/tests/unit/core/test_testcase.py @@ -22,6 +22,7 @@ import mock import requests from xtesting.core import testcase +from xtesting.utils import constants __author__ = "Cedric Ollivier " @@ -400,19 +401,21 @@ class TestCaseTesting(unittest.TestCase): mock.call().meta.client.head_bucket(Bucket='xtesting'), mock.call().Bucket('xtesting'), mock.call().Bucket().upload_file( - '/var/lib/xtesting/results/xtesting.log', - 'prefix/xtesting.log', + constants.LOG_PATH, + os.path.join('prefix', os.path.basename(constants.LOG_PATH)), Config=mock.ANY, ExtraArgs={'ContentType': 'application/octet-stream'}), mock.call().Bucket('xtesting'), mock.call().Bucket().upload_file( - '/var/lib/xtesting/results/xtesting.debug.log', - 'prefix/xtesting.debug.log', + constants.DEBUG_LOG_PATH, + os.path.join('prefix', + os.path.basename(constants.DEBUG_LOG_PATH)), Config=mock.ANY, ExtraArgs={'ContentType': 'application/octet-stream'}), mock.call().Bucket('xtesting'), mock.call().Bucket().upload_file( - '/var/lib/xtesting/results/bar', 'prefix/bar', + os.path.join(constants.RESULTS_DIR, 'bar'), + 'prefix/bar', Config=mock.ANY, ExtraArgs={'ContentType': 'application/octet-stream'})] self.assertEqual(args[1].mock_calls, expected) @@ -432,19 +435,21 @@ class TestCaseTesting(unittest.TestCase): mock.call().meta.client.head_bucket(Bucket='xtesting'), mock.call().Bucket('xtesting'), mock.call().Bucket().upload_file( - '/var/lib/xtesting/results/xtesting.log', - 'prefix/xtesting.log', + constants.LOG_PATH, + os.path.join('prefix', os.path.basename(constants.LOG_PATH)), Config=mock.ANY, ExtraArgs={'ContentType': 'text/plain'}), mock.call().Bucket('xtesting'), mock.call().Bucket().upload_file( - '/var/lib/xtesting/results/xtesting.debug.log', - 'prefix/xtesting.debug.log', + constants.DEBUG_LOG_PATH, + os.path.join('prefix', + os.path.basename(constants.DEBUG_LOG_PATH)), Config=mock.ANY, ExtraArgs={'ContentType': 'text/plain'}), mock.call().Bucket('xtesting'), mock.call().Bucket().upload_file( - '/var/lib/xtesting/results/bar', 'prefix/bar', + os.path.join(constants.RESULTS_DIR, 'bar'), + 'prefix/bar', Config=mock.ANY, ExtraArgs={'ContentType': 'text/plain'})] self.assertEqual(args[1].mock_calls, expected) diff --git a/xtesting/utils/constants.py b/xtesting/utils/constants.py index 18e03f68..7677f2e5 100644 --- a/xtesting/utils/constants.py +++ b/xtesting/utils/constants.py @@ -2,4 +2,13 @@ # pylint: disable=missing-docstring +import os + ENV_FILE = '/var/lib/xtesting/conf/env_file' + +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') + +INI_PATH = 'ci/logging.ini' +DEBUG_INI_PATH = 'ci/logging.debug.ini'