From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 5 Jun 2013 07:24:29 +0000 (+0000)
Subject: Merge "Handle IPv6 specifid glance servers gracefully"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=74fe24626a4f420434efefe48ce6ec6a060b8a93;p=openstack-build%2Fcinder-build.git

Merge "Handle IPv6 specifid glance servers gracefully"
---

74fe24626a4f420434efefe48ce6ec6a060b8a93
diff --cc cinder/tests/image/test_glance.py
index 116096f8e,2a80e2dfe..745f8b654
--- a/cinder/tests/image/test_glance.py
+++ b/cinder/tests/image/test_glance.py
@@@ -551,17 -555,10 +555,17 @@@ class TestGlanceClientVersion(test.Test
              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"""
+         """Test glance version set by flag is honoured."""
          client_wrapper_v1 = glance.GlanceClientWrapper('fake', 'fake_host',
                                                         9292)
          self.assertEquals(client_wrapper_v1.client.__module__,