Fix shade tests with OCC 1.13.0

The latest os-client-config, 1.13.0, breaks the shade tests as the
client instantiations are slightly different. Since I'm not sure we
can modify our tests to use against different OCC versions (there
doesn't appear to be a version attribute anywhere), I upped the
minimum requirements.txt value as well as fixed the tests for the
latest version.

Change-Id: I18292ca39789c41caea74901754d66d3301bb420
This commit is contained in:
David Shrewsbury 2015-12-22 17:12:30 -05:00
parent 2486cae218
commit c10566cc0a
2 changed files with 4 additions and 3 deletions

View File

@ -4,7 +4,7 @@ munch
decorator
jsonpatch
ipaddress
os-client-config>=1.11.1
os-client-config>=1.13.0
requestsexceptions>=1.1.1
six

View File

@ -80,8 +80,8 @@ class TestShade(base.TestCase):
get_session_mock.return_value = session_mock
self.cloud.glance_client
mock_client.assert_called_with(
'2',
endpoint='http://example.com',
2.0,
endpoint_override='http://example.com',
region_name='', service_name=None,
interface='public',
service_type='image', session=mock.ANY,
@ -95,6 +95,7 @@ class TestShade(base.TestCase):
self.cloud.heat_client
mock_client.assert_called_with(
'1',
endpoint_override=None,
endpoint_type='public',
region_name='',
service_name=None,