From af91c23a45e6d0b1f957c1b2114ce67a0f89f529 Mon Sep 17 00:00:00 2001 From: wanghao Date: Thu, 19 May 2016 20:27:28 +0800 Subject: [PATCH] Remove deprecated tempest_lib and use tempest.lib Since 10.0.0 release tempest-ib is deprecated now. Cinderclient should use tempest.lib in test code and add tempest>=11.0.0 in requirements following global-requirements. Closes-Bug: #1583583 Change-Id: I9d766f46eb6fff29ae9c0267a60ff2ef4bf2343e --- cinderclient/tests/functional/base.py | 6 +++--- test-requirements.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cinderclient/tests/functional/base.py b/cinderclient/tests/functional/base.py index d6a929cbb..de8f665e0 100644 --- a/cinderclient/tests/functional/base.py +++ b/cinderclient/tests/functional/base.py @@ -14,9 +14,9 @@ import os import time import six -from tempest_lib.cli import base -from tempest_lib.cli import output_parser -from tempest_lib import exceptions +from tempest.lib.cli import base +from tempest.lib.cli import output_parser +from tempest.lib import exceptions _CREDS_FILE = 'functional_creds.conf' diff --git a/test-requirements.txt b/test-requirements.txt index 8589c16c4..17fd9fb39 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -13,7 +13,7 @@ python-subunit>=0.0.18 # Apache-2.0/BSD reno>=1.6.2 # Apache2 requests-mock>=0.7.0 # Apache-2.0 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD -tempest-lib>=0.14.0 # Apache-2.0 +tempest>=11.0.0 # Apache-2.0 testtools>=1.4.0 # MIT testrepository>=0.0.18 # Apache-2.0/BSD os-testr>=0.4.1 # Apache-2.0