Merge lp:~corey.bryant/glance/2014.2.1 into lp:~ubuntu-server-dev/glance/juno

[Corey Bryant]

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-16 14:26:49 +0000
+++ debian/changelog	2014-12-05 22:20:59 +0000
@@ -1,3 +1,19 @@
+glance (1:2014.2.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Resynchronize with stable/juno (41e143b) (LP: #1398952):
+    - [640e08f] Disable osprofiler by default
+    - [c5e302e] Image not downloaded without restricted property
+    - [be90df8] Make RequestContext use auth_token (not auth_tok)
+    - [10a6985] Swift Multi-tenant store: Pass context on upload
+    - [540306e] Upgrade tests' mocks to match glance_store
+    - [22b1992] Fix for adopt glance.store library in Glance
+    - [3cdd0aa] Improve error log for expired image location url
+    - [41e143b] Can not delete images if db deadlock occurs
+  * d/control: Add python-hacking and python-mock to Build-Depends-Indep.
+  * d/p/update-glance-store-tests.patch: Added to fix failing tests.
+
+ -- Corey Bryant <[e-mail]>  Fri, 05 Dec 2014 09:03:14 -0500
+
 glance (1:2014.2-0ubuntu1) utopic; urgency=medium
 
   * New upstream release.

=== modified file 'debian/control'
--- debian/control	2014-10-03 11:06:47 +0000
+++ debian/control	2014-12-05 22:20:59 +0000
@@ -13,6 +13,7 @@
  python-fixtures (>= 0.3.12),
  python-glance-store (>= 0.1.1),
  python-greenlet (>= 0.3.2),
+ python-hacking (>= 0.9.2),
  python-httplib2 (>= 0.7.5),
  python-iso8601 (>= 0.1.9),
  python-jsonschema (>= 2.0.0),
@@ -21,6 +22,7 @@
  python-kombu (>= 2.4.8),
  python-lxml (>= 2.3),
  python-migrate (>= 0.9.1),
+ python-mock (>= 1.0),
  python-mox,
  python-netaddr (>= 0.7.6),
  python-openssl (>= 0.11),

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-10-03 11:06:47 +0000
+++ debian/patches/series	2014-12-05 22:20:59 +0000
@@ -1,3 +1,4 @@
+update-glance-store-tests.patch
 sql_conn.patch
 fix-requirements.patch
 ipv6-support.patch

=== added file 'debian/patches/update-glance-store-tests.patch'
--- debian/patches/update-glance-store-tests.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/update-glance-store-tests.patch	2014-12-05 22:20:59 +0000
@@ -0,0 +1,55 @@
+Description: This patch reverts changes made by commit
+             540306eccb60b8cd5ecd86c3d15ed51291d98d15.  That commit
+             was made to stay in sync with changes made in the latest
+             glance_store release, which is not in Utopic.
+Author: Corey Bryant <[e-mail]>
+Forwarded: not-needed
+--- a/glance/tests/unit/v1/test_upload_utils.py
++++ b/glance/tests/unit/v1/test_upload_utils.py
+@@ -110,7 +110,7 @@
+                update_data)
+ 
+         store.add.assert_called_once_with(image_meta['id'], mock.ANY,
+-                                          image_meta['size'], context=mock.ANY)
++                                          image_meta['size'])
+ 
+     def test_upload_data_to_store(self):
+         req = unit_test_utils.get_fake_request()
+--- a/glance/tests/unit/test_store_image.py
++++ b/glance/tests/unit/test_store_image.py
+@@ -859,9 +859,8 @@
+ 
+     def _bad_metadata(self, in_metadata):
+         mstore = self.mox.CreateMockAnything()
+-        mstore.add(self.image_id, mox.IgnoreArg(),
+-                   self.size, context=None).AndReturn(
+-                       (self.location, self.size, self.checksum, in_metadata))
++        mstore.add(self.image_id, mox.IgnoreArg(), self.size).AndReturn(
++            (self.location, self.size, self.checksum, in_metadata))
+         mstore.__str__ = lambda: "hello"
+         mstore.__unicode__ = lambda: "hello"
+ 
+@@ -878,9 +877,8 @@
+     def _good_metadata(self, in_metadata):
+ 
+         mstore = self.mox.CreateMockAnything()
+-        mstore.add(self.image_id, mox.IgnoreArg(),
+-                   self.size, context=None).AndReturn(
+-                       (self.location, self.size, self.checksum, in_metadata))
++        mstore.add(self.image_id, mox.IgnoreArg(), self.size).AndReturn(
++            (self.location, self.size, self.checksum, in_metadata))
+ 
+         self.mox.ReplayAll()
+         (location,
+@@ -937,9 +935,8 @@
+ 
+     def test_bad_metadata_not_dict(self):
+         store = self.mox.CreateMockAnything()
+-        store.add(self.image_id, mox.IgnoreArg(),
+-                  self.size, context=None).AndReturn(
+-                      (self.location, self.size, self.checksum, []))
++        store.add(self.image_id, mox.IgnoreArg(), self.size).AndReturn(
++            (self.location, self.size, self.checksum, []))
+         store.__str__ = lambda: "hello"
+         store.__unicode__ = lambda: "hello"
+