diff options
| -rw-r--r-- | docker/core/Dockerfile | 1 | ||||
| -rw-r--r-- | tox.ini | 2 | ||||
| -rw-r--r-- | xtesting/ci/tier_handler.py | 18 | ||||
| -rw-r--r-- | xtesting/tests/unit/ci/test_tier_handler.py | 5 |
4 files changed, 2 insertions, 24 deletions
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 \ @@ -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/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]) |