Merge "Add waiters to Nova tests to prevent tearDown failures"
diff --git a/lower-constraints.txt b/lower-constraints.txt
index a5ff1ca..9422676 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -8,7 +8,7 @@
chardet==3.0.4
cliff==2.11.0
cmd2==0.8.1
-coverage==4.5.1
+coverage==4.0
cryptography==2.1.4
debtcollector==1.19.0
docutils==0.14
@@ -35,20 +35,20 @@
netaddr==0.7.19
netifaces==0.10.6
nose==1.3.7
-nosexcover==1.0.11
+nosexcover==1.0.10
openstackdocstheme==1.20.0
os-client-config==1.29.0
oslo.concurrency==3.26.0
oslo.config==5.2.0
oslo.context==2.20.0
oslo.i18n==3.20.0
-oslo.log==3.37.0
-oslo.policy==1.34.0
+oslo.log==3.36.0
+oslo.policy==1.30.0
oslo.serialization==2.25.0
oslo.utils==3.36.0
-oslotest==3.3.0
+oslotest==3.2.0
paramiko==2.4.1
-pbr==3.1.1
+pbr==2.0.0
pep8==1.5.7
prettytable==0.7.2
pyasn1==0.4.2
@@ -73,8 +73,8 @@
Sphinx==1.6.5
sphinxcontrib-websupport==1.0.1
stestr==2.0.0
-stevedore==1.28.0
-tempest==18.0.0
+stevedore==1.20.0
+tempest==17.1.0
testrepository==0.0.20
testtools==2.3.0
traceback2==1.4.0
diff --git a/patrole_tempest_plugin/tests/api/compute/test_flavor_access_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_flavor_access_rbac.py
index 976f18c..d6364c9 100644
--- a/patrole_tempest_plugin/tests/api/compute/test_flavor_access_rbac.py
+++ b/patrole_tempest_plugin/tests/api/compute/test_flavor_access_rbac.py
@@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-from oslo_config import cfg
+from tempest import config
from tempest.lib.common.utils import test_utils
from tempest.lib import decorators
@@ -22,7 +22,7 @@
from patrole_tempest_plugin import rbac_rule_validation
from patrole_tempest_plugin.tests.api.compute import rbac_base
-CONF = cfg.CONF
+CONF = config.CONF
class FlavorAccessRbacTest(rbac_base.BaseV2ComputeRbacTest):
diff --git a/patrole_tempest_plugin/tests/api/compute/test_tenant_networks_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_tenant_networks_rbac.py
index 4331f02..49fb34c 100644
--- a/patrole_tempest_plugin/tests/api/compute/test_tenant_networks_rbac.py
+++ b/patrole_tempest_plugin/tests/api/compute/test_tenant_networks_rbac.py
@@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-from oslo_config import cfg
+from tempest import config
from tempest.common import utils
from tempest.lib import decorators
@@ -21,7 +21,7 @@
from patrole_tempest_plugin import rbac_rule_validation
from patrole_tempest_plugin.tests.api.compute import rbac_base
-CONF = cfg.CONF
+CONF = config.CONF
class TenantNetworksRbacTest(rbac_base.BaseV2ComputeRbacTest):
diff --git a/test-requirements.txt b/test-requirements.txt
index d6e73bd..35e4e57 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,7 +1,7 @@
# The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-hacking>=1.0.0 # Apache-2.0
+hacking>=1.0.0,<1.1.0 # Apache-2.0
fixtures>=3.0.0 # Apache-2.0/BSD
mock>=2.0.0 # BSD
coverage!=4.4,>=4.0 # Apache-2.0