diff options
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | tempest_lib/common/utils/data_utils.py | 10 | ||||
| -rw-r--r-- | test-requirements.txt | 4 | ||||
| -rw-r--r-- | tox.ini | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/requirements.txt b/requirements.txt index 6629585..dd1377e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,4 +8,4 @@ iso8601>=0.1.9 jsonschema>=2.0.0,<3.0.0 httplib2>=0.7.5 six>=1.9.0 -oslo.log>=0.4.0 # Apache-2.0 +oslo.log>=1.0.0,<1.1.0 # Apache-2.0 diff --git a/tempest_lib/common/utils/data_utils.py b/tempest_lib/common/utils/data_utils.py index eec2474..dc799fe 100644 --- a/tempest_lib/common/utils/data_utils.py +++ b/tempest_lib/common/utils/data_utils.py @@ -27,12 +27,14 @@ def rand_uuid_hex(): return uuid.uuid4().hex -def rand_name(name=''): +def rand_name(name='', prefix=None): randbits = str(random.randint(1, 0x7fffffff)) + rand_name = randbits if name: - return name + '-' + randbits - else: - return randbits + rand_name = name + '-' + rand_name + if prefix: + rand_name = prefix + '-' + rand_name + return rand_name def rand_url(): diff --git a/test-requirements.txt b/test-requirements.txt index aed1f05..0561abf 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,8 +7,8 @@ coverage>=3.6 discover python-subunit>=0.0.18 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 -oslosphinx>=2.2.0 # Apache-2.0 -oslotest>=1.2.0 # Apache-2.0 +oslosphinx>=2.5.0,<2.6.0 # Apache-2.0 +oslotest>=1.5.1,<1.6.0 # Apache-2.0 testrepository>=0.0.18 testscenarios>=0.4 testtools>=0.9.36,!=1.2.0 @@ -20,7 +20,7 @@ commands = flake8 commands = {posargs} [testenv:cover] -commands = python setup.py testr --coverage --coverage-package-name='tempest_lib' --testr-args='{posargs}' +commands = python setup.py test --coverage --coverage-package-name='tempest_lib' --testr-args='{posargs}' [testenv:docs] commands = python setup.py build_sphinx |