OpenStack Identity (keystone)

Merge lp:~zulcss/keystone/keystone-refresh-ftbfs into lp:~openstack-ubuntu-testing/keystone/havana

  1. keystone-refresh-ftbfs
  2. Merge into havana
Proposed by Chuck Short
Status: Merged
Merged at revision: 200
Proposed branch: lp:~zulcss/keystone/keystone-refresh-ftbfs
Merge into: lp:~openstack-ubuntu-testing/keystone/havana
Diff against target: 185 lines (+35/-37)
3 files modified
debian/changelog (+4/-1)
debian/patches/fix-ubuntu-tests.patch (+28/-32)
debian/patches/sql_connection.patch (+3/-4)
To merge this branch: bzr merge lp:~zulcss/keystone/keystone-refresh-ftbfs
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Openstack Ubuntu Testers Pending
Review via email: mp+167825@code.launchpad.net

Description of the change

patches refreshed

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

lgtm

review: Approve

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 2013-06-03 12:59:11 +0000
3+++ debian/changelog 2013-06-06 18:28:48 +0000
4@@ -1,4 +1,4 @@
5-keystone (1:2013.2~b1-0ubuntu2) saucy; urgency=low
6+keystone (1:2013.2.b1.46.gb3e4969-0ubuntu1) UNRELEASED; urgency=low
7
8 [ Adam Gandelman ]
9 * debian/patches/*: Refresh
10@@ -6,6 +6,9 @@
11 [ Yolanda Robla ]
12 * debian/tests: added autopkgtests
13
14+ [ Chuck Short ]
15+ * New upstream release
16+
17 -- Yolanda Robla <yolanda.robla@canonical.com> Mon, 03 Jun 2013 14:57:00 +0100
18
19 keystone (1:2013.2~b1-0ubuntu1) saucy; urgency=low
20
21=== modified file 'debian/patches/fix-ubuntu-tests.patch'
22--- debian/patches/fix-ubuntu-tests.patch 2013-05-31 19:23:59 +0000
23+++ debian/patches/fix-ubuntu-tests.patch 2013-06-06 18:28:48 +0000
24@@ -1,21 +1,19 @@
25-Index: keystone/run_tests.sh
26-===================================================================
27---- keystone.orig/run_tests.sh 2013-05-31 12:18:17.689748590 -0700
28-+++ keystone/run_tests.sh 2013-05-31 12:18:17.685748590 -0700
29-@@ -69,7 +69,7 @@
30+diff -Naurp keystone-2013.2.b1.46.gb3e4969.orig/run_tests.sh keystone-2013.2.b1.46.gb3e4969/run_tests.sh
31+--- keystone-2013.2.b1.46.gb3e4969.orig/run_tests.sh 2013-06-06 13:02:21.000000000 -0500
32++++ keystone-2013.2.b1.46.gb3e4969/run_tests.sh 2013-06-06 13:08:52.453872876 -0500
33+@@ -69,7 +69,7 @@ always_venv=0
34 never_venv=0
35 force=0
36 noseargs=
37 -noseopts="--with-openstack --openstack-color"
38 +noseopts=""
39 wrapper=""
40- just_pep8=0
41- short_pep8=0
42-Index: keystone/tests/test_content_types.py
43-===================================================================
44---- keystone.orig/tests/test_content_types.py 2013-05-31 12:18:17.689748590 -0700
45-+++ keystone/tests/test_content_types.py 2013-05-31 12:22:44.933761333 -0700
46-@@ -212,7 +212,10 @@
47+ just_flake8=0
48+ short_flake8=0
49+diff -Naurp keystone-2013.2.b1.46.gb3e4969.orig/tests/test_content_types.py keystone-2013.2.b1.46.gb3e4969/tests/test_content_types.py
50+--- keystone-2013.2.b1.46.gb3e4969.orig/tests/test_content_types.py 2013-06-06 13:02:21.000000000 -0500
51++++ keystone-2013.2.b1.46.gb3e4969/tests/test_content_types.py 2013-06-06 13:08:52.453872876 -0500
52+@@ -212,7 +212,10 @@ class RestfulTestCase(test.TestCase):
53 return self._request(app=self.public_app, **kwargs)
54
55 def admin_request(self, **kwargs):
56@@ -25,9 +23,9 @@
57 + except:
58 + raise nose.exc.SkipTest('Disabled by ubuntu packaging')
59
60- def get_scoped_token(self, tenant_id=None):
61+ def _get_token(self, body):
62 """Convenience method so that we can test authenticated requests."""
63-@@ -396,16 +399,22 @@
64+@@ -408,16 +411,22 @@ class CoreApiTests(object):
65 dict(roles=[self.role_service['id']]))
66
67 token = self.get_scoped_token(tenant_id='service')
68@@ -55,7 +53,7 @@
69 self.assertValidAuthenticationResponse(r, require_service_catalog=True)
70
71 def test_validate_token_no_belongs_to_still_returns_catalog(self):
72-@@ -432,11 +441,14 @@
73+@@ -444,11 +453,14 @@ class CoreApiTests(object):
74
75 def test_endpoints(self):
76 token = self.get_scoped_token()
77@@ -74,11 +72,10 @@
78 self.assertValidEndpointListResponse(r)
79
80 def test_get_tenant(self):
81-Index: keystone/tests/test_keystoneclient.py
82-===================================================================
83---- keystone.orig/tests/test_keystoneclient.py 2013-05-31 12:18:17.689748590 -0700
84-+++ keystone/tests/test_keystoneclient.py 2013-05-31 12:18:17.685748590 -0700
85-@@ -36,10 +36,6 @@
86+diff -Naurp keystone-2013.2.b1.46.gb3e4969.orig/tests/test_keystoneclient.py keystone-2013.2.b1.46.gb3e4969/tests/test_keystoneclient.py
87+--- keystone-2013.2.b1.46.gb3e4969.orig/tests/test_keystoneclient.py 2013-06-06 13:02:21.000000000 -0500
88++++ keystone-2013.2.b1.46.gb3e4969/tests/test_keystoneclient.py 2013-06-06 13:08:52.457872876 -0500
89+@@ -36,10 +36,6 @@ class CompatTestCase(test.TestCase):
90 def setUp(self):
91 super(CompatTestCase, self).setUp()
92
93@@ -89,7 +86,7 @@
94 self.load_backends()
95 self.load_fixtures(default_fixtures)
96
97-@@ -942,6 +938,8 @@
98+@@ -955,6 +951,8 @@ class KcMasterTestCase(CompatTestCase, K
99 client.tenants.list, limit=-1)
100
101 def test_roles_get_by_user(self):
102@@ -98,7 +95,7 @@
103 client = self.get_client(admin=True)
104 roles = client.roles.roles_for_user(user=self.user_foo['id'],
105 tenant=self.tenant_bar['id'])
106-@@ -1039,6 +1037,8 @@
107+@@ -1052,6 +1050,8 @@ class KcEssex3TestCase(CompatTestCase, K
108 return KEYSTONECLIENT_REPO, 'essex-3'
109
110 def test_tenant_add_and_remove_user(self):
111@@ -107,7 +104,7 @@
112 client = self.get_client(admin=True)
113 client.roles.add_user_to_tenant(tenant_id=self.tenant_bar['id'],
114 user_id=self.user_two['id'],
115-@@ -1067,6 +1067,7 @@
116+@@ -1080,6 +1080,7 @@ class KcEssex3TestCase(CompatTestCase, K
117 [x.tenantId for x in role_refs])
118
119 def test_roles_get_by_user(self):
120@@ -115,7 +112,7 @@
121 client = self.get_client(admin=True)
122 roles = client.roles.get_user_role_refs(user_id='foo')
123 self.assertTrue(len(roles) > 0)
124-@@ -1078,6 +1079,8 @@
125+@@ -1091,6 +1092,8 @@ class KcEssex3TestCase(CompatTestCase, K
126 raise nose.exc.SkipTest('N/A')
127
128 def test_user_create_update_delete(self):
129@@ -124,11 +121,10 @@
130 from keystoneclient import exceptions as client_exceptions
131
132 test_username = 'new_user'
133-Index: keystone/tests/test_v3_auth.py
134-===================================================================
135---- keystone.orig/tests/test_v3_auth.py 2013-05-31 12:18:17.689748590 -0700
136-+++ keystone/tests/test_v3_auth.py 2013-05-31 12:18:17.685748590 -0700
137-@@ -738,12 +738,15 @@
138+diff -Naurp keystone-2013.2.b1.46.gb3e4969.orig/tests/test_v3_auth.py keystone-2013.2.b1.46.gb3e4969/tests/test_v3_auth.py
139+--- keystone-2013.2.b1.46.gb3e4969.orig/tests/test_v3_auth.py 2013-06-06 13:02:21.000000000 -0500
140++++ keystone-2013.2.b1.46.gb3e4969/tests/test_v3_auth.py 2013-06-06 13:08:52.457872876 -0500
141+@@ -833,12 +833,15 @@ class TestAuthJSON(test_v3.RestfulTestCa
142 r = self.post('/projects', body={'project': ref})
143 project = self.assertValidProjectResponse(r, ref)
144
145@@ -150,7 +146,7 @@
146
147 # set the user's preferred project
148 body = {'user': {'default_project_id': project['id']}}
149-@@ -1057,9 +1060,12 @@
150+@@ -1152,9 +1155,12 @@ class TestTrustAuth(TestAuthInfo):
151 r = self.post('/OS-TRUST/trusts', body={'trust': ref})
152 trust = self.assertValidTrustResponse(r, ref)
153
154@@ -166,7 +162,7 @@
155 self.assertValidTrustResponse(r, ref)
156
157 # validate roles on the trust
158-@@ -1150,9 +1156,12 @@
159+@@ -1245,9 +1251,12 @@ class TestTrustAuth(TestAuthInfo):
160 r = self.post('/OS-TRUST/trusts', body={'trust': ref})
161 trust = self.assertValidTrustResponse(r, ref)
162
163@@ -182,7 +178,7 @@
164
165 auth_data = self.build_authentication_request(
166 user_id=self.trustee_user['id'],
167-@@ -1373,7 +1382,10 @@
168+@@ -1468,7 +1477,10 @@ class TestTrustAuth(TestAuthInfo):
169 role_ids=[self.role_id])
170 del ref['id']
171
172
173=== modified file 'debian/patches/sql_connection.patch'
174--- debian/patches/sql_connection.patch 2013-05-31 19:23:59 +0000
175+++ debian/patches/sql_connection.patch 2013-06-06 18:28:48 +0000
176@@ -1,7 +1,6 @@
177-Index: keystone/etc/keystone.conf.sample
178-===================================================================
179---- keystone.orig/etc/keystone.conf.sample 2013-05-31 12:22:59.949762049 -0700
180-+++ keystone/etc/keystone.conf.sample 2013-05-31 12:22:59.941762049 -0700
181+diff -Naurp keystone-2013.2.b1.46.gb3e4969.orig/etc/keystone.conf.sample keystone-2013.2.b1.46.gb3e4969/etc/keystone.conf.sample
182+--- keystone-2013.2.b1.46.gb3e4969.orig/etc/keystone.conf.sample 2013-06-06 13:02:21.000000000 -0500
183++++ keystone-2013.2.b1.46.gb3e4969/etc/keystone.conf.sample 2013-06-06 13:09:45.325872902 -0500
184 @@ -52,10 +52,10 @@
185 # verbose = False
186

Subscribers

People subscribed via source and target branches