Merge lp:~gandelman-a/ubuntu/saucy/cinder/fix_image_tests into lp:~openstack-ubuntu-testing/cinder/havana

[Adam Gandelman]

Applying a patch that is currently in review @ https://review.openstack.org/#/c/30795/ Remove it if it gets merged. Not sure if this is a valid upstream bug. Upstream CI currently uses python-glanceclient (and all other clients) from pypi, not trunk (like us) Test suite needs to stub out some other method if using newer glanceclient.

Unmerged revisions

104. By Adam Gandelman on 2013-05-28

debian/glanceclient_test_fix.patch: Stub out another glanceclient
method that blocks tests. (LP: #1185178)

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-28 19:38:42 +0000
+++ debian/changelog	2013-05-28 23:53:25 +0000
@@ -1,23 +1,4 @@
-cinder (1:2013.2.a278.g05ce36a-0ubuntu1) UNRELEASED; urgency=low
-
-  [ Chuck Short ]
-  * New upstream version.
-  * debian/patches/fix_cinder_dependencies.patch: Dropped.
-  * debian/control: Bump standards version to 3.9.4.
-  * debian/control: Add python-pbr and python-d2to1 to build-depends.
-  * debian/control: Add python-testtools and python-fixtures to build-depends
-  * debian/rules: Add work around to remove wonky setup.py setup
-  * debian/cinder-common.install: Add cinder-rpc-zmq-receiver binary.
-
-  [ James Page ]
-  * debian/control: Drop surplus dependency on python-glance (LP: #1175600).
-  * debian/control,rules: Drop dependency on pep8, don't run pep8 tests during
-    package build process (its just way to late).
-  * debian/control: Drop surplus BD on python-cheetah.
-
- -- Chuck Short <[e-mail]>  Tue, 30 Apr 2013 08:09:08 -0500
-
-cinder (1:2013.2.a226.g1d6de0f-0ubuntu2) UNRELEASED; urgency=low
+cinder (1:2013.2.a226.g1d6de0f-0ubuntu3) UNRELEASED; urgency=low
 
   [ Chuck Short ]
   * New upstream version.
@@ -36,8 +17,10 @@
   [ Adam Gandelman ]
   * debian/patches/avoid_paramiko_vers_depends.patch: Avoid version
     requirement on paramiko.
+  * debian/glanceclient_test_fix.patch: Stub out another glanceclient
+    method that blocks tests. (LP: #1185178)
 
- -- Adam Gandelman <[e-mail]>  Thu, 23 May 2013 19:12:56 -0700
+ -- Adam Gandelman <[e-mail]>  Tue, 28 May 2013 16:47:07 -0700
 
 cinder (1:2013.1-0ubuntu2) raring; urgency=low
 
 
=== added file 'debian/patches/glanceclient_test_fix.patch'
--- debian/patches/glanceclient_test_fix.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/glanceclient_test_fix.patch	2013-05-28 23:53:25 +0000
@@ -0,0 +1,45 @@
+From 1365ada3bcd8b9f7f4c1c7f7c9f158fc9ae867b3 Mon Sep 17 00:00:00 2001
+From: Adam Gandelman <[e-mail]>
+Date: Tue, 28 May 2013 14:34:30 -0700
+Subject: [PATCH 1/1] 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 46bbafa..116096f 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"""
+-- 
+1.8.1.2
+
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-05-24 02:13:46 +0000
+++ debian/patches/series	2013-05-28 23:53:25 +0000
@@ -1,1 +1,2 @@
 avoid_paramiko_vers_depends.patch
+glanceclient_test_fix.patch