diff options
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rw-r--r-- | docker/core/Dockerfile | 1 | ||||
| -rw-r--r-- | setup.cfg | 6 | ||||
| -rw-r--r-- | tox.ini | 2 | ||||
| -rw-r--r-- | xtesting/ci/tier_handler.py | 18 | ||||
| -rw-r--r-- | xtesting/core/testcase.py | 9 | ||||
| -rw-r--r-- | xtesting/tests/unit/ci/test_tier_handler.py | 5 | ||||
| -rw-r--r-- | xtesting/utils/constants.py | 2 |
8 files changed, 12 insertions, 40 deletions
diff --git a/.travis.yml b/.travis.yml index 6a23ba7c..66ba80e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,17 +2,10 @@ sudo: required services: docker language: generic -dist: xenial -addons: - apt: - packages: - - libssl1.0.0 +dist: focal before_script: - sudo docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - - sudo add-apt-repository -y ppa:deadsnakes/ppa - - sudo apt-get update - - sudo apt-get install python3.8 python3.8-dev python3.8-distutils - sudo pip install tox tox-pip-version - sudo -E docker login -u="${DOCKER_USERNAME}" -p="${DOCKER_PASSWORD}" - (cd .. && git clone https://github.com/estesp/manifest-tool) diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 45248ff2..c746fd06 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -9,6 +9,7 @@ RUN apk -U upgrade && \ python3-dev build-base libxml2-dev libxslt-dev linux-headers && \ wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \ sed -i -E /^PyYAML==+.*$/d upper-constraints.txt && \ + sed -i -E /^six==+.*$/d upper-constraints.txt && \ case $(uname -m) in aarch*|arm*) CFLAGS="-O0" \ pip3 install --no-cache-dir \ -cupper-constraints.txt \ @@ -1,11 +1,11 @@ [metadata] name = xtesting summary = OPNFV reference testing framework -description-file = +description_file = README.rst author = OPNFV -author-email = opnfv-tech-discuss@lists.opnfv.org -home-page = https://wiki.opnfv.org/display/functest +author_email = opnfv-tech-discuss@lists.opnfv.org +home_page = https://wiki.opnfv.org/display/functest classifiers = Intended Audience :: Information Technology Intended Audience :: System Administrators @@ -50,7 +50,7 @@ basepython = python3.8 commands = ansible-lint -x303,305,306 ansible/site.yml -[testenv:py37] +[testenv:py38] commands = nosetests xtesting/tests/unit [testenv:bashate] diff --git a/xtesting/ci/tier_handler.py b/xtesting/ci/tier_handler.py index 6f78f202..86f1374f 100644 --- a/xtesting/ci/tier_handler.py +++ b/xtesting/ci/tier_handler.py @@ -16,24 +16,6 @@ import textwrap import prettytable -LINE_LENGTH = 72 - - -def split_text(text, max_len): - words = text.split() - lines = [] - line = "" - for word in words: - if len(line) + len(word) < max_len - 1: - line += word + " " - else: - lines.append(line) - line = word + " " - if line != "": - lines.append(line) - return lines - - class Tier(): def __init__(self, name, description=""): 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/tests/unit/ci/test_tier_handler.py b/xtesting/tests/unit/ci/test_tier_handler.py index 5ee62c4f..668f33cc 100644 --- a/xtesting/tests/unit/ci/test_tier_handler.py +++ b/xtesting/tests/unit/ci/test_tier_handler.py @@ -29,11 +29,6 @@ class TierHandlerTesting(unittest.TestCase): self.testcase.str = self.testcase.__str__() self.tier.str = self.tier.__str__() - def test_split_text(self): - test_str = 'this is for testing' - self.assertEqual(tier_handler.split_text(test_str, 10), - ['this is ', 'for ', 'testing ']) - def test_add_test(self): self.tier.add_test(self.test) self.assertEqual(self.tier.tests_array, [self.test]) 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') |