From c10566cc0ab0a9415d650a93941deb9b62ecdaf7 Mon Sep 17 00:00:00 2001
From: David Shrewsbury <shrewsbury.dave@gmail.com>
Date: Tue, 22 Dec 2015 17:12:30 -0500
Subject: [PATCH] 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
---
 requirements.txt               | 2 +-
 shade/tests/unit/test_shade.py | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 8d6eaf752..47db714ea 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -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
 
diff --git a/shade/tests/unit/test_shade.py b/shade/tests/unit/test_shade.py
index a6c8bdb8f..402cefb24 100644
--- a/shade/tests/unit/test_shade.py
+++ b/shade/tests/unit/test_shade.py
@@ -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,