Merge lp:~corey.bryant/glance/2014.1.2 into lp:~ubuntu-server-dev/glance/icehouse

Proposed by Corey Bryant on 2014-08-08
Status: Merged
Merged at revision: 298
Proposed branch: lp:~corey.bryant/glance/2014.1.2
Merge into: lp:~ubuntu-server-dev/glance/icehouse
Diff against target: 181 lines (+13/-115)
5 files modified
debian/changelog (+11/-0)
debian/patches/fix-requirements.patch (+0/-15)
debian/patches/series (+1/-2)
debian/patches/skip-tests-2.patch (+1/-0)
debian/patches/skip-tests.patch (+0/-98)
To merge this branch: bzr merge lp:~corey.bryant/glance/2014.1.2
Reviewer Review Type Date Requested Status
Ubuntu Server Developers 2014-08-08 Pending
Review via email: mp+230184@code.launchpad.net
To post a comment you must log in.
lp:~corey.bryant/glance/2014.1.2 updated on 2014-08-08
298. By Corey Bryant on 2014-08-08

* Resynchronize with stable/icehouse (94383db) (LP: #1354159):
  - [5508653] Fix lazy translation UnicodeErrors
  - [94383db] Provide explicit image create value for test_image_paginate case
* d/p/fix-requirements.patch: Refreshed.
* d/p/skip-tests.patch: Dropped.
* d/p/skip-tests-2.patch: Updated description.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-07-02 13:31:52 +0000
3+++ debian/changelog 2014-08-08 21:43:09 +0000
4@@ -1,3 +1,14 @@
5+glance (1:2014.1.2-0ubuntu1) trusty; urgency=medium
6+
7+ * Resynchronize with stable/icehouse (94383db) (LP: #1354159):
8+ - [5508653] Fix lazy translation UnicodeErrors
9+ - [94383db] Provide explicit image create value for test_image_paginate case
10+ * d/p/fix-requirements.patch: Refreshed.
11+ * d/p/skip-tests.patch: Dropped.
12+ * d/p/skip-tests-2.patch: Updated description.
13+
14+ -- Corey Bryant <corey.bryant@canonical.com> Thu, 07 Aug 2014 17:09:28 -0400
15+
16 glance (1:2014.1.1-0ubuntu2) trusty; urgency=medium
17
18 * d/p/skip-tests-2.patch: Add patch to skip broken upstream tests.
19
20=== added file 'debian/patches/fix-requirements.patch'
21--- debian/patches/fix-requirements.patch 1970-01-01 00:00:00 +0000
22+++ debian/patches/fix-requirements.patch 2014-08-08 21:43:09 +0000
23@@ -0,0 +1,15 @@
24+Description: Set min version of six.
25+Author: Corey Bryant <corey.bryant@canonical.com>
26+Forwarded: Not needed.
27+Index: glance/requirements.txt
28+===================================================================
29+--- a/requirements.txt
30++++ b/requirements.txt
31+@@ -38,6 +38,6 @@
32+ pyOpenSSL>=0.11
33+
34+ # Required by openstack.common libraries
35+-six>=1.6.0
36++six>=1.5.2
37+
38+ oslo.messaging>=1.3.0
39
40=== removed file 'debian/patches/fix-requirements.patch'
41--- debian/patches/fix-requirements.patch 2014-06-13 15:37:04 +0000
42+++ debian/patches/fix-requirements.patch 1970-01-01 00:00:00 +0000
43@@ -1,15 +0,0 @@
44-Description: Set min version of six.
45-Author: Corey Bryant <corey.bryant@canonical.com>
46-Forwarded: Not needed.
47-Index: glance/requirements.txt
48-===================================================================
49---- glance.orig/requirements.txt 2014-06-13 10:13:33.028556468 -0400
50-+++ glance/requirements.txt 2014-06-13 11:33:56.440409418 -0400
51-@@ -38,6 +38,6 @@
52- pyOpenSSL>=0.11
53-
54- # Required by openstack.common libraries
55--six>=1.6.0
56-+six>=1.5.2
57-
58- oslo.messaging>=1.3.0a9
59
60=== modified file 'debian/patches/series'
61--- debian/patches/series 2014-07-02 13:31:52 +0000
62+++ debian/patches/series 2014-08-08 21:43:09 +0000
63@@ -1,4 +1,3 @@
64+fix-requirements.patch
65 skip-tests-2.patch
66 sql_conn.patch
67-skip-tests.patch
68-fix-requirements.patch
69
70=== modified file 'debian/patches/skip-tests-2.patch'
71--- debian/patches/skip-tests-2.patch 2014-07-02 13:31:52 +0000
72+++ debian/patches/skip-tests-2.patch 2014-08-08 21:43:09 +0000
73@@ -1,4 +1,5 @@
74 Description: Skip broken tests until fixed upstream.
75+ This fails only on ppa builds.
76 See https://bugs.launchpad.net/glance/+bug/1298918
77 Author: Corey Bryant <corey.bryant@canonical.com>
78 Forwarded: Not needed.
79
80=== removed file 'debian/patches/skip-tests.patch'
81--- debian/patches/skip-tests.patch 2014-01-07 18:44:29 +0000
82+++ debian/patches/skip-tests.patch 1970-01-01 00:00:00 +0000
83@@ -1,98 +0,0 @@
84-Description: Skip tests failing in buildds
85-Author: Chuck Short <zulcss@ubuntu.com>
86-Forwarded: No
87-diff --git a/glance/tests/functional/db/base.py b/glance/tests/functional/db/base.py
88-index 7856b7d..79d700a 100644
89---- a/glance/tests/functional/db/base.py
90-+++ b/glance/tests/functional/db/base.py
91-@@ -164,9 +164,12 @@ class DriverTests(object):
92- self.assertFalse('tags' in image)
93-
94- def test_image_create_duplicate_id(self):
95-- self.assertRaises(exception.Duplicate,
96-- self.db_api.image_create,
97-- self.context, {'id': UUID1, 'status': 'queued'})
98-+ try:
99-+ self.assertRaises(exception.Duplicate,
100-+ self.db_api.image_create,
101-+ self.context, {'id': UUID1, 'status': 'queued'})
102-+ except:
103-+ self.skipTest('Skipped by Ubuntu')
104-
105- def test_image_create_with_locations(self):
106- locations = [{'url': 'a', 'metadata': {}},
107-diff --git a/glance/tests/functional/v1/test_ssl.py b/glance/tests/functional/v1/test_ssl.py
108-index d1244c7..1c4e7e6 100644
109---- a/glance/tests/functional/v1/test_ssl.py
110-+++ b/glance/tests/functional/v1/test_ssl.py
111-@@ -1229,7 +1229,10 @@ class TestSSL(functional.FunctionalTest):
112- path = "https://%s:%d/v1/images" % ("127.0.0.1", self.api_port)
113- https = httplib2.Http(disable_ssl_certificate_validation=True)
114- response, content = https.request(path, 'POST', headers=headers)
115-- self.assertEqual(response.status, 409)
116-+ try:
117-+ self.assertEqual(response.status, 409)
118-+ except:
119-+ self.skipTest('Skipped by Ubuntu')
120- expected = "An image with identifier %s already exists" % image_id
121- self.assertTrue(expected in content,
122- "Could not find '%s' in '%s'" % (expected, content))
123-diff --git a/glance/tests/integration/legacy_functional/test_v1_api.py b/glance/tests/integration/legacy_functional/test_v1_api.py
124-index e3b5b7d..2ac44da 100644
125---- a/glance/tests/integration/legacy_functional/test_v1_api.py
126-+++ b/glance/tests/integration/legacy_functional/test_v1_api.py
127-@@ -986,7 +986,10 @@ class TestApi(base.ApiTest):
128- 'X-Image-Meta-Id': image['id'],
129- 'X-Image-Meta-Is-Public': 'True'}
130- path = "/v1/images"
131-- response, content = self.http.request(path, 'POST', headers=headers)
132-+ try:
133-+ response, content = self.http.request(path, 'POST', headers=headers)
134-+ except:
135-+ self.skipTest('Skipped by Ubuntu')
136- self.assertEqual(response.status, 409)
137-
138- def test_delete_not_existing(self):
139-diff --git a/glance/tests/unit/v1/test_registry_client.py b/glance/tests/unit/v1/test_registry_client.py
140-index d7c3fb8..fbb0caa 100644
141---- a/glance/tests/unit/v1/test_registry_client.py
142-+++ b/glance/tests/unit/v1/test_registry_client.py
143-@@ -722,9 +722,12 @@ class TestRegistryV1Client(base.IsolatedUnitTest, test_utils.RegistryAPIMixIn):
144- fixture = self.get_fixture(id=UUID2,
145- location="file:///tmp/glance-tests/2")
146-
147-- self.assertRaises(exception.Duplicate,
148-- self.client.add_image,
149-- fixture)
150-+ try:
151-+ self.assertRaises(exception.Duplicate,
152-+ self.client.add_image,
153-+ fixture)
154-+ except:
155-+ self.skipTest('Skipped by Ubuntu')
156-
157- def test_add_image_with_bad_status(self):
158- """Tests proper exception is raised if a bad status is set"""
159-diff --git a/glance/tests/unit/v2/test_registry_client.py b/glance/tests/unit/v2/test_registry_client.py
160-index 03b4ec7..eb87320 100644
161---- a/glance/tests/unit/v2/test_registry_client.py
162-+++ b/glance/tests/unit/v2/test_registry_client.py
163-@@ -433,9 +433,12 @@ class TestRegistryV2Client(base.IsolatedUnitTest,
164- fixture = self.get_fixture(id=UUID2,
165- location="file:///tmp/glance-tests/2")
166-
167-- self.assertRaises(exception.Duplicate,
168-- self.client.image_create,
169-- values=fixture)
170-+ try:
171-+ self.assertRaises(exception.Duplicate,
172-+ self.client.image_create,
173-+ values=fixture)
174-+ except:
175-+ self.skipTest('Skipped by Ubuntu')
176-
177- def test_image_create_with_bad_status(self):
178- """Tests proper exception is raised if a bad status is set"""
179---
180-1.8.5.2
181-

Subscribers

People subscribed via source and target branches