From 1365ada3bcd8b9f7f4c1c7f7c9f158fc9ae867b3 Mon Sep 17 00:00:00 2001 From: Adam Gandelman Date: Tue, 28 May 2013 14:34:30 -0700 Subject: [PATCH] test_glance.py: Stub out _get_member_model as well. glanceclient's v2 client needs to also have its _get_member_model() stubbed out as well, to avoid attempts to reach 'fake_host' during client instantiation. Update: Only stub when _get_member_model() when required. Change-Id: I943cbb017ccdbe4f6c994bc83cbefe8693f4672b Fixes: bug #1185178. --- cinder/tests/image/test_glance.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/cinder/tests/image/test_glance.py b/cinder/tests/image/test_glance.py index 46bbafa9c..116096f8e 100644 --- a/cinder/tests/image/test_glance.py +++ b/cinder/tests/image/test_glance.py @@ -547,11 +547,18 @@ class TestGlanceClientVersion(test.TestCase): def setUp(self): super(TestGlanceClientVersion, self).setUp() - def fake_get_image_model(self): + def fake_get_model(self): return self.stubs.Set(glanceclient_v2, '_get_image_model', - fake_get_image_model) + fake_get_model) + + try: + self.stubs.Set(glanceclient_v2, '_get_member_model', + fake_get_model) + except AttributeError: + # method requires stubbing only with newer glanceclients. + pass def test_glance_version_by_flag(self): """Test glance version set by flag is honoured""" -- 2.45.2