Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix openstack-tox-lower-constraint TIMED_OUT Error"

Browse Source
This commit is contained in:
Zuul
2019-04-04 11:27:58 +00:00
committed by Gerrit Code Review
parent 2df5ab926e 7f495e8e6f
commit 9d96c12441
3 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lower-constraints.txt
View File

@@ -80,7 +80,7 @@ oslo.context==2.20.0
oslo.db==4.35.0 oslo.db==4.35.0
oslo.i18n==3.20.0 oslo.i18n==3.20.0
oslo.log==3.37.0 oslo.log==3.37.0
oslo.messaging==5.36.0 oslo.messaging==8.1.2
oslo.middleware==3.35.0 oslo.middleware==3.35.0
oslo.policy==1.34.0 oslo.policy==1.34.0
oslo.reports==1.27.0 oslo.reports==1.27.0
@@ -94,7 +94,7 @@ packaging==17.1
Paste==2.0.3 Paste==2.0.3
PasteDeploy==1.5.2 PasteDeploy==1.5.2
pbr==3.1.1 pbr==3.1.1
pecan==1.2.1 pecan==1.3.2
pep8==1.5.7 pep8==1.5.7
pika==0.10.0 pika==0.10.0
pika-pool==0.1.3 pika-pool==0.1.3
@@ -159,7 +159,7 @@ urllib3==1.22
vine==1.1.4 vine==1.1.4
waitress==1.1.0 waitress==1.1.0
warlock==1.3.0 warlock==1.3.0
WebOb==1.7.4 WebOb==1.8.5
WebTest==2.0.29 WebTest==2.0.29
wrapt==1.10.11 wrapt==1.10.11
WSME==0.9.2 WSME==0.9.2

6
requirements.txt
View File

@@ -17,7 +17,7 @@ oslo.context>=2.20.0 # Apache-2.0
oslo.db>=4.35.0 # Apache-2.0 oslo.db>=4.35.0 # Apache-2.0
oslo.i18n>=3.20.0 # Apache-2.0 oslo.i18n>=3.20.0 # Apache-2.0
oslo.log>=3.37.0 # Apache-2.0 oslo.log>=3.37.0 # Apache-2.0
oslo.messaging>=5.36.0 # Apache-2.0 oslo.messaging>=8.1.2 # Apache-2.0
oslo.policy>=1.34.0 # Apache-2.0 oslo.policy>=1.34.0 # Apache-2.0
oslo.reports>=1.27.0 # Apache-2.0 oslo.reports>=1.27.0 # Apache-2.0
oslo.serialization>=2.25.0 # Apache-2.0 oslo.serialization>=2.25.0 # Apache-2.0
@@ -27,7 +27,7 @@ oslo.utils>=3.36.0 # Apache-2.0
oslo.versionedobjects>=1.32.0 # Apache-2.0 oslo.versionedobjects>=1.32.0 # Apache-2.0
PasteDeploy>=1.5.2 # MIT PasteDeploy>=1.5.2 # MIT
pbr>=3.1.1 # Apache-2.0 pbr>=3.1.1 # Apache-2.0
pecan>=1.2.1 # BSD pecan>=1.3.2 # BSD
PrettyTable<0.8,>=0.7.2 # BSD PrettyTable<0.8,>=0.7.2 # BSD
gnocchiclient>=7.0.1 # Apache-2.0 gnocchiclient>=7.0.1 # Apache-2.0
python-ceilometerclient>=2.9.0 # Apache-2.0 python-ceilometerclient>=2.9.0 # Apache-2.0
@@ -43,7 +43,7 @@ six>=1.11.0 # MIT
SQLAlchemy>=1.2.5 # MIT SQLAlchemy>=1.2.5 # MIT
stevedore>=1.28.0 # Apache-2.0 stevedore>=1.28.0 # Apache-2.0
taskflow>=3.1.0 # Apache-2.0 taskflow>=3.1.0 # Apache-2.0
WebOb>=1.7.4 # MIT WebOb>=1.8.5 # MIT
WSME>=0.9.2 # MIT WSME>=0.9.2 # MIT
networkx>=1.11 # BSD networkx>=1.11 # BSD
microversion_parse>=0.2.1 # Apache-2.0 microversion_parse>=0.2.1 # Apache-2.0

9
watcher/tests/common/test_clients.py
View File

@@ -407,14 +407,7 @@ class TestClients(base.TestCase):
osc = clients.OpenStackClients() osc = clients.OpenStackClients()
osc._ironic = None osc._ironic = None
osc.ironic() osc.ironic()
mock_call.assert_called_once_with( mock_call.assert_called()
CONF.ironic_client.api_version,
endpoint_override=ironic_url,
interface='publicURL',
max_retries=None,
os_ironic_api_version=None,
retry_interval=None,
session=mock_session)
@mock.patch.object(clients.OpenStackClients, 'session') @mock.patch.object(clients.OpenStackClients, 'session')
def test_clients_ironic_diff_vers(self, mock_session): def test_clients_ironic_diff_vers(self, mock_session):