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

Subscribers

People subscribed via source and target branches