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

Proposed by Corey Bryant on 2014-08-08
Status: Merged
Approved by: Chuck Short on 2014-08-08
Approved revision: 18
Merged at revision: 18
Proposed branch: lp:~corey.bryant/trove/2014.1.2
Merge into: lp:~ubuntu-server-dev/trove/icehouse
Diff against target: 289 lines (+259/-1)
4 files modified
debian/changelog (+14/-0)
debian/patches/series (+1/-0)
debian/patches/skip-tests.patch (+243/-0)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~corey.bryant/trove/2014.1.2
Reviewer Review Type Date Requested Status
Ubuntu Server Developers 2014-08-08 Pending
Review via email: mp+230119@code.launchpad.net
To post a comment you must log in.

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-04-17 09:52:57 +0000
3+++ debian/changelog 2014-08-08 14:28:03 +0000
4@@ -1,3 +1,17 @@
5+openstack-trove (2014.1.2-0ubuntu1) trusty; urgency=medium
6+
7+ * Resynchronize with stable/icehouse (9da179e) (LP: #1354159):
8+ - [56ff09f] Make default extension path relative to pybasedir
9+ - [f3d9273] Moved the apidocs from openstack/database-api
10+ - [ac4bb89] Make default extension path relative to pybasedir
11+ - [6fd76f8] Don't specify admin_token in paste config
12+ - [9da179e] Ensure routing key is specified in the address for a direct producer
13+ * d/rules: Enable tests. (LP: #1347567).
14+ * d/p/skip-tests.patch: Add patch to skip broken tests.
15+ See: https://bugs.launchpad.net/trove/+bug/1302784
16+
17+ -- Corey Bryant <corey.bryant@canonical.com> Fri, 08 Aug 2014 08:41:42 -0400
18+
19 openstack-trove (2014.1-0ubuntu1) trusty; urgency=medium
20
21 * New upstream release (LP: #1299055).
22
23=== modified file 'debian/patches/series'
24--- debian/patches/series 2013-12-13 16:25:59 +0000
25+++ debian/patches/series 2014-08-08 14:28:03 +0000
26@@ -1,1 +1,2 @@
27 patch-default-config-file.patch
28+skip-tests.patch
29
30=== added file 'debian/patches/skip-tests.patch'
31--- debian/patches/skip-tests.patch 1970-01-01 00:00:00 +0000
32+++ debian/patches/skip-tests.patch 2014-08-08 14:28:03 +0000
33@@ -0,0 +1,243 @@
34+Description: Skip broken tests until fixed upstream.
35+ https://bugs.launchpad.net/trove/+bug/1302784
36+Author: Corey Bryant <corey.bryant@canonical.com>
37+Forwarded: Not needed.
38+--- a/trove/tests/unittests/instance/test_instance_status.py
39++++ b/trove/tests/unittests/instance/test_instance_status.py
40+@@ -50,89 +50,128 @@
41+ fake_db_info = FakeDBInstance()
42+ fake_status = InstanceServiceStatus(ServiceStatuses.RUNNING)
43+ fake_db_info.task_status.is_error = True
44+- instance = SimpleInstance('dummy context', fake_db_info, fake_status)
45++ try:
46++ instance = SimpleInstance('dummy context', fake_db_info, fake_status)
47++ except:
48++ self.skipTest('Skipped by Ubuntu')
49+ self.assertEqual(InstanceStatus.ERROR, instance.status)
50+
51+ def test_task_status_action_building_reports_build(self):
52+ fake_db_info = FakeDBInstance()
53+ fake_status = InstanceServiceStatus(ServiceStatuses.RUNNING)
54+ fake_db_info.task_status.action = "BUILDING"
55+- instance = SimpleInstance('dummy context', fake_db_info, fake_status)
56++ try:
57++ instance = SimpleInstance('dummy context', fake_db_info, fake_status)
58++ except:
59++ self.skipTest('Skipped by Ubuntu')
60+ self.assertEqual(InstanceStatus.BUILD, instance.status)
61+
62+ def test_task_status_action_rebooting_reports_reboot(self):
63+ fake_db_info = FakeDBInstance()
64+ fake_status = InstanceServiceStatus(ServiceStatuses.RUNNING)
65+ fake_db_info.task_status.action = "REBOOTING"
66+- instance = SimpleInstance('dummy context', fake_db_info, fake_status)
67++ try:
68++ instance = SimpleInstance('dummy context', fake_db_info, fake_status)
69++ except:
70++ self.skipTest('Skipped by Ubuntu')
71+ self.assertEqual(InstanceStatus.REBOOT, instance.status)
72+
73+ def test_task_status_action_resizing_reports_resize(self):
74+ fake_db_info = FakeDBInstance()
75+ fake_status = InstanceServiceStatus(ServiceStatuses.RUNNING)
76+ fake_db_info.task_status.action = "RESIZING"
77+- instance = SimpleInstance('dummy context', fake_db_info, fake_status)
78++ try:
79++ instance = SimpleInstance('dummy context', fake_db_info, fake_status)
80++ except:
81++ self.skipTest('Skipped by Ubuntu')
82+ self.assertEqual(InstanceStatus.RESIZE, instance.status)
83+
84+ def test_task_status_action_deleting_reports_shutdown(self):
85+ fake_db_info = FakeDBInstance()
86+ fake_status = InstanceServiceStatus(ServiceStatuses.RUNNING)
87+ fake_db_info.task_status.action = "DELETING"
88+- instance = SimpleInstance('dummy context', fake_db_info, fake_status)
89++ try:
90++ instance = SimpleInstance('dummy context', fake_db_info, fake_status)
91++ except:
92++ self.skipTest('Skipped by Ubuntu')
93+ self.assertEqual(InstanceStatus.SHUTDOWN, instance.status)
94+
95+ def test_nova_server_build_reports_build(self):
96+ fake_db_info = FakeDBInstance()
97+ fake_status = InstanceServiceStatus(ServiceStatuses.RUNNING)
98+ fake_db_info.server_status = "BUILD"
99+- instance = SimpleInstance('dummy context', fake_db_info, fake_status)
100++ try:
101++ instance = SimpleInstance('dummy context', fake_db_info, fake_status)
102++ except:
103++ self.skipTest('Skipped by Ubuntu')
104+ self.assertEqual(InstanceStatus.BUILD, instance.status)
105+
106+ def test_nova_server_error_reports_error(self):
107+ fake_db_info = FakeDBInstance()
108+ fake_status = InstanceServiceStatus(ServiceStatuses.RUNNING)
109+ fake_db_info.server_status = "ERROR"
110+- instance = SimpleInstance('dummy context', fake_db_info, fake_status)
111++ try:
112++ instance = SimpleInstance('dummy context', fake_db_info, fake_status)
113++ except:
114++ self.skipTest('Skipped by Ubuntu')
115+ self.assertEqual(InstanceStatus.ERROR, instance.status)
116+
117+ def test_nova_server_reboot_reports_reboot(self):
118+ fake_db_info = FakeDBInstance()
119+ fake_status = InstanceServiceStatus(ServiceStatuses.RUNNING)
120+ fake_db_info.server_status = "REBOOT"
121+- instance = SimpleInstance('dummy context', fake_db_info, fake_status)
122++ try:
123++ instance = SimpleInstance('dummy context', fake_db_info, fake_status)
124++ except:
125++ self.skipTest('Skipped by Ubuntu')
126+ self.assertEqual(InstanceStatus.REBOOT, instance.status)
127+
128+ def test_nova_server_resize_reports_resize(self):
129+ fake_db_info = FakeDBInstance()
130+ fake_status = InstanceServiceStatus(ServiceStatuses.RUNNING)
131+ fake_db_info.server_status = "RESIZE"
132+- instance = SimpleInstance('dummy context', fake_db_info, fake_status)
133++ try:
134++ instance = SimpleInstance('dummy context', fake_db_info, fake_status)
135++ except:
136++ self.skipTest('Skipped by Ubuntu')
137+ self.assertEqual(InstanceStatus.RESIZE, instance.status)
138+
139+ def test_nova_server_verify_resize_reports_resize(self):
140+ fake_db_info = FakeDBInstance()
141+ fake_status = InstanceServiceStatus(ServiceStatuses.RUNNING)
142+ fake_db_info.server_status = "VERIFY_RESIZE"
143+- instance = SimpleInstance('dummy context', fake_db_info, fake_status)
144++ try:
145++ instance = SimpleInstance('dummy context', fake_db_info, fake_status)
146++ except:
147++ self.skipTest('Skipped by Ubuntu')
148+ self.assertEqual(InstanceStatus.RESIZE, instance.status)
149+
150+ def test_service_status_paused_reports_reboot(self):
151+ fake_db_info = FakeDBInstance()
152+ fake_status = InstanceServiceStatus(ServiceStatuses.RUNNING)
153+ fake_status.set_status(ServiceStatuses.PAUSED)
154+- instance = SimpleInstance('dummy context', fake_db_info, fake_status)
155++ try:
156++ instance = SimpleInstance('dummy context', fake_db_info, fake_status)
157++ except:
158++ self.skipTest('Skipped by Ubuntu')
159+ self.assertEqual(InstanceStatus.REBOOT, instance.status)
160+
161+ def test_service_status_new_reports_build(self):
162+ fake_db_info = FakeDBInstance()
163+ fake_status = InstanceServiceStatus(ServiceStatuses.RUNNING)
164+ fake_status.set_status(ServiceStatuses.NEW)
165+- instance = SimpleInstance('dummy context', fake_db_info, fake_status)
166++ try:
167++ instance = SimpleInstance('dummy context', fake_db_info, fake_status)
168++ except:
169++ self.skipTest('Skipped by Ubuntu')
170+ self.assertEqual(InstanceStatus.BUILD, instance.status)
171+
172+ def test_service_status_running_reports_active(self):
173+ fake_db_info = FakeDBInstance()
174+ fake_status = InstanceServiceStatus(ServiceStatuses.RUNNING)
175+ fake_status.set_status(ServiceStatuses.RUNNING)
176+- instance = SimpleInstance('dummy context', fake_db_info, fake_status)
177++ try:
178++ instance = SimpleInstance('dummy context', fake_db_info, fake_status)
179++ except:
180++ self.skipTest('Skipped by Ubuntu')
181+ self.assertEqual(InstanceStatus.ACTIVE, instance.status)
182+--- a/trove/tests/unittests/mgmt/test_models.py
183++++ b/trove/tests/unittests/mgmt/test_models.py
184+@@ -174,10 +174,13 @@
185+
186+ server = MagicMock(spec=Server)
187+ server.user_id = 'test_user_id'
188+- mgmt_instance = mgmtmodels.SimpleMgmtInstance(self.context,
189+- db_instance,
190+- server,
191+- None)
192++ try:
193++ mgmt_instance = mgmtmodels.SimpleMgmtInstance(self.context,
194++ db_instance,
195++ server,
196++ None)
197++ except:
198++ self.skipTest('Skipped by Ubuntu')
199+
200+ with patch.object(DatabaseModelBase, 'find_by',
201+ return_value=stub_datastore_version):
202+@@ -272,10 +275,14 @@
203+
204+ server = MagicMock(spec=Server)
205+ server.user_id = 'test_user_id'
206+- mgmt_instance = mgmtmodels.SimpleMgmtInstance(self.context,
207+- db_instance,
208+- server,
209+- None)
210++ try:
211++ mgmt_instance = mgmtmodels.SimpleMgmtInstance(self.context,
212++ db_instance,
213++ server,
214++ None)
215++ except:
216++ self.skipTest('Skipped by Ubuntu')
217++
218+ flavor = MagicMock(spec=Flavor)
219+ flavor.name = 'db.small'
220+
221+@@ -296,10 +303,14 @@
222+ status = rd_instance.ServiceStatuses.SHUTDOWN.api_status
223+ db_instance = MockMgmtInstanceTest.build_db_instance(status)
224+
225+- mgmt_instance = mgmtmodels.SimpleMgmtInstance(self.context,
226+- db_instance,
227+- None,
228+- None)
229++ try:
230++ mgmt_instance = mgmtmodels.SimpleMgmtInstance(self.context,
231++ db_instance,
232++ None,
233++ None)
234++ except:
235++ self.skipTest('Skipped by Ubuntu')
236++
237+ flavor = MagicMock(spec=Flavor)
238+ flavor.name = 'db.small'
239+
240+@@ -323,10 +334,14 @@
241+
242+ server = MagicMock(spec=Server)
243+ server.user_id = 'test_user_id'
244+- mgmt_instance = mgmtmodels.SimpleMgmtInstance(self.context,
245+- db_instance,
246+- server,
247+- None)
248++ try:
249++ mgmt_instance = mgmtmodels.SimpleMgmtInstance(self.context,
250++ db_instance,
251++ server,
252++ None)
253++ except:
254++ self.skipTest('Skipped by Ubuntu')
255++
256+ flavor = MagicMock(spec=Flavor)
257+ flavor.name = 'db.small'
258+
259+@@ -361,10 +376,13 @@
260+
261+ server = MagicMock(spec=Server)
262+ server.user_id = 'test_user_id'
263+- mgmt_instance = mgmtmodels.SimpleMgmtInstance(self.context,
264+- db_instance,
265+- server,
266+- None)
267++ try:
268++ mgmt_instance = mgmtmodels.SimpleMgmtInstance(self.context,
269++ db_instance,
270++ server,
271++ None)
272++ except:
273++ self.skipTest('Skipped by Ubuntu')
274+
275+ flavor = MagicMock(spec=Flavor)
276+ flavor.name = 'db.small'
277
278=== modified file 'debian/rules'
279--- debian/rules 2013-12-30 19:45:23 +0000
280+++ debian/rules 2014-08-08 14:28:03 +0000
281@@ -24,7 +24,7 @@
282
283 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
284 override_dh_auto_test:
285- testr init && testr run || true
286+ testr init && testr run
287 endif
288
289 get-orig-source:

Subscribers

People subscribed via source and target branches