Glance

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

  1. 2014.1.2
  2. Merge into icehouse
Proposed by Corey Bryant
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 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
298. By Corey Bryant

* 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
=== modified file 'debian/changelog'
--- debian/changelog 2014-07-02 13:31:52 +0000
+++ debian/changelog 2014-08-08 21:43:09 +0000
@@ -1,3 +1,14 @@
1glance (1:2014.1.2-0ubuntu1) trusty; urgency=medium
2
3 * Resynchronize with stable/icehouse (94383db) (LP: #1354159):
4 - [5508653] Fix lazy translation UnicodeErrors
5 - [94383db] Provide explicit image create value for test_image_paginate case
6 * d/p/fix-requirements.patch: Refreshed.
7 * d/p/skip-tests.patch: Dropped.
8 * d/p/skip-tests-2.patch: Updated description.
9
10 -- Corey Bryant <corey.bryant@canonical.com> Thu, 07 Aug 2014 17:09:28 -0400
11
1glance (1:2014.1.1-0ubuntu2) trusty; urgency=medium12glance (1:2014.1.1-0ubuntu2) trusty; urgency=medium
213
3 * d/p/skip-tests-2.patch: Add patch to skip broken upstream tests.14 * d/p/skip-tests-2.patch: Add patch to skip broken upstream tests.
415
=== added file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/fix-requirements.patch 2014-08-08 21:43:09 +0000
@@ -0,0 +1,15 @@
1Description: Set min version of six.
2Author: Corey Bryant <corey.bryant@canonical.com>
3Forwarded: Not needed.
4Index: glance/requirements.txt
5===================================================================
6--- a/requirements.txt
7+++ b/requirements.txt
8@@ -38,6 +38,6 @@
9 pyOpenSSL>=0.11
10
11 # Required by openstack.common libraries
12-six>=1.6.0
13+six>=1.5.2
14
15 oslo.messaging>=1.3.0
016
=== removed file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch 2014-06-13 15:37:04 +0000
+++ debian/patches/fix-requirements.patch 1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
1Description: Set min version of six.
2Author: Corey Bryant <corey.bryant@canonical.com>
3Forwarded: Not needed.
4Index: glance/requirements.txt
5===================================================================
6--- glance.orig/requirements.txt 2014-06-13 10:13:33.028556468 -0400
7+++ glance/requirements.txt 2014-06-13 11:33:56.440409418 -0400
8@@ -38,6 +38,6 @@
9 pyOpenSSL>=0.11
10
11 # Required by openstack.common libraries
12-six>=1.6.0
13+six>=1.5.2
14
15 oslo.messaging>=1.3.0a9
160
=== modified file 'debian/patches/series'
--- debian/patches/series 2014-07-02 13:31:52 +0000
+++ debian/patches/series 2014-08-08 21:43:09 +0000
@@ -1,4 +1,3 @@
1fix-requirements.patch
1skip-tests-2.patch2skip-tests-2.patch
2sql_conn.patch3sql_conn.patch
3skip-tests.patch
4fix-requirements.patch
54
=== modified file 'debian/patches/skip-tests-2.patch'
--- debian/patches/skip-tests-2.patch 2014-07-02 13:31:52 +0000
+++ debian/patches/skip-tests-2.patch 2014-08-08 21:43:09 +0000
@@ -1,4 +1,5 @@
1Description: Skip broken tests until fixed upstream.1Description: Skip broken tests until fixed upstream.
2 This fails only on ppa builds.
2 See https://bugs.launchpad.net/glance/+bug/12989183 See https://bugs.launchpad.net/glance/+bug/1298918
3Author: Corey Bryant <corey.bryant@canonical.com>4Author: Corey Bryant <corey.bryant@canonical.com>
4Forwarded: Not needed.5Forwarded: Not needed.
56
=== removed file 'debian/patches/skip-tests.patch'
--- debian/patches/skip-tests.patch 2014-01-07 18:44:29 +0000
+++ debian/patches/skip-tests.patch 1970-01-01 00:00:00 +0000
@@ -1,98 +0,0 @@
1Description: Skip tests failing in buildds
2Author: Chuck Short <zulcss@ubuntu.com>
3Forwarded: No
4diff --git a/glance/tests/functional/db/base.py b/glance/tests/functional/db/base.py
5index 7856b7d..79d700a 100644
6--- a/glance/tests/functional/db/base.py
7+++ b/glance/tests/functional/db/base.py
8@@ -164,9 +164,12 @@ class DriverTests(object):
9 self.assertFalse('tags' in image)
10
11 def test_image_create_duplicate_id(self):
12- self.assertRaises(exception.Duplicate,
13- self.db_api.image_create,
14- self.context, {'id': UUID1, 'status': 'queued'})
15+ try:
16+ self.assertRaises(exception.Duplicate,
17+ self.db_api.image_create,
18+ self.context, {'id': UUID1, 'status': 'queued'})
19+ except:
20+ self.skipTest('Skipped by Ubuntu')
21
22 def test_image_create_with_locations(self):
23 locations = [{'url': 'a', 'metadata': {}},
24diff --git a/glance/tests/functional/v1/test_ssl.py b/glance/tests/functional/v1/test_ssl.py
25index d1244c7..1c4e7e6 100644
26--- a/glance/tests/functional/v1/test_ssl.py
27+++ b/glance/tests/functional/v1/test_ssl.py
28@@ -1229,7 +1229,10 @@ class TestSSL(functional.FunctionalTest):
29 path = "https://%s:%d/v1/images" % ("127.0.0.1", self.api_port)
30 https = httplib2.Http(disable_ssl_certificate_validation=True)
31 response, content = https.request(path, 'POST', headers=headers)
32- self.assertEqual(response.status, 409)
33+ try:
34+ self.assertEqual(response.status, 409)
35+ except:
36+ self.skipTest('Skipped by Ubuntu')
37 expected = "An image with identifier %s already exists" % image_id
38 self.assertTrue(expected in content,
39 "Could not find '%s' in '%s'" % (expected, content))
40diff --git a/glance/tests/integration/legacy_functional/test_v1_api.py b/glance/tests/integration/legacy_functional/test_v1_api.py
41index e3b5b7d..2ac44da 100644
42--- a/glance/tests/integration/legacy_functional/test_v1_api.py
43+++ b/glance/tests/integration/legacy_functional/test_v1_api.py
44@@ -986,7 +986,10 @@ class TestApi(base.ApiTest):
45 'X-Image-Meta-Id': image['id'],
46 'X-Image-Meta-Is-Public': 'True'}
47 path = "/v1/images"
48- response, content = self.http.request(path, 'POST', headers=headers)
49+ try:
50+ response, content = self.http.request(path, 'POST', headers=headers)
51+ except:
52+ self.skipTest('Skipped by Ubuntu')
53 self.assertEqual(response.status, 409)
54
55 def test_delete_not_existing(self):
56diff --git a/glance/tests/unit/v1/test_registry_client.py b/glance/tests/unit/v1/test_registry_client.py
57index d7c3fb8..fbb0caa 100644
58--- a/glance/tests/unit/v1/test_registry_client.py
59+++ b/glance/tests/unit/v1/test_registry_client.py
60@@ -722,9 +722,12 @@ class TestRegistryV1Client(base.IsolatedUnitTest, test_utils.RegistryAPIMixIn):
61 fixture = self.get_fixture(id=UUID2,
62 location="file:///tmp/glance-tests/2")
63
64- self.assertRaises(exception.Duplicate,
65- self.client.add_image,
66- fixture)
67+ try:
68+ self.assertRaises(exception.Duplicate,
69+ self.client.add_image,
70+ fixture)
71+ except:
72+ self.skipTest('Skipped by Ubuntu')
73
74 def test_add_image_with_bad_status(self):
75 """Tests proper exception is raised if a bad status is set"""
76diff --git a/glance/tests/unit/v2/test_registry_client.py b/glance/tests/unit/v2/test_registry_client.py
77index 03b4ec7..eb87320 100644
78--- a/glance/tests/unit/v2/test_registry_client.py
79+++ b/glance/tests/unit/v2/test_registry_client.py
80@@ -433,9 +433,12 @@ class TestRegistryV2Client(base.IsolatedUnitTest,
81 fixture = self.get_fixture(id=UUID2,
82 location="file:///tmp/glance-tests/2")
83
84- self.assertRaises(exception.Duplicate,
85- self.client.image_create,
86- values=fixture)
87+ try:
88+ self.assertRaises(exception.Duplicate,
89+ self.client.image_create,
90+ values=fixture)
91+ except:
92+ self.skipTest('Skipped by Ubuntu')
93
94 def test_image_create_with_bad_status(self):
95 """Tests proper exception is raised if a bad status is set"""
96--
971.8.5.2
98

Subscribers

People subscribed via source and target branches