Ubuntu system image

Merge lp:~barry/ubuntu-system-image/lp1215586 into lp:~registry/ubuntu-system-image/client

  1. lp1215586
  2. Merge into client
Proposed by Barry Warsaw
Status: Rejected
Rejected by: Barry Warsaw
Proposed branch: lp:~barry/ubuntu-system-image/lp1215586
Merge into: lp:~registry/ubuntu-system-image/client
Diff against target: 536 lines (+129/-129)
4 files modified
systemimage/bindings.py (+1/-1)
systemimage/dbus.py (+4/-9)
systemimage/testing/dbus.py (+54/-48)
systemimage/tests/test_dbus.py (+70/-71)
To merge this branch: bzr merge lp:~barry/ubuntu-system-image/lp1215586
Reviewer Review Type Date Requested Status
Registry Administrators Pending
Review via email: mp+190209@code.launchpad.net

Description of the change

Re-enables the array-of-dictionary descriptions. Merging to trunk awaits support landing in system-settings.

To post a comment you must log in.
lp:~barry/ubuntu-system-image/lp1215586 updated
184. By Barry Warsaw

trunk merge

185. By Barry Warsaw

trunk merge

186. By Barry Warsaw

trunk merge

187. By Barry Warsaw

Fix.

188. By Barry Warsaw

trunk merge

189. By Barry Warsaw

Trunk merge

Unmerged revisions

189. By Barry Warsaw

Trunk merge

188. By Barry Warsaw

trunk merge

187. By Barry Warsaw

Fix.

186. By Barry Warsaw

trunk merge

185. By Barry Warsaw

trunk merge

184. By Barry Warsaw

trunk merge

183. By Barry Warsaw

Re-enable the array-of-dictionaries descriptions.

LP: #1215586

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'systemimage/bindings.py'
2--- systemimage/bindings.py 2013-10-31 21:50:21 +0000
3+++ systemimage/bindings.py 2013-12-04 16:58:17 +0000
4@@ -47,7 +47,7 @@
5 self, signal, path,
6 is_available, downloading, available_version, update_size,
7 last_update_date,
8- #descriptions,
9+ descriptions,
10 error_reason):
11 if error_reason != '':
12 # Cancel the download, set the failed flag and log the reason.
13
14=== modified file 'systemimage/dbus.py'
15--- systemimage/dbus.py 2013-11-12 22:55:55 +0000
16+++ systemimage/dbus.py 2013-12-04 16:58:17 +0000
17@@ -95,10 +95,8 @@
18 self._update.version,
19 self._update.size,
20 self._update.last_update_date,
21- # XXX 2013-08-22 - the u/i cannot currently currently handle the
22- # array of dictionaries data type. LP: #1215586
23- #self._update.descriptions,
24- "")
25+ self._update.descriptions,
26+ '')
27 self._checking = False
28 # Stop GLib from calling this method again.
29 return False
30@@ -283,15 +281,12 @@
31 """Quit the daemon immediately."""
32 self._loop.quit()
33
34- # XXX 2013-08-22 The u/i cannot currently handle the array of dictionaries
35- # data type for the descriptions. LP: #1215586
36- #@signal('com.canonical.SystemImage', signature='bbsisaa{ss}s')
37- @signal('com.canonical.SystemImage', signature='bbsiss')
38+ @signal('com.canonical.SystemImage', signature='bbsisaa{ss}s')
39 def UpdateAvailableStatus(self,
40 is_available, downloading,
41 available_version, update_size,
42 last_update_date,
43- #descriptions,
44+ descriptions,
45 error_reason):
46 """Signal sent in response to a CheckForUpdate()."""
47 self._loop.keepalive()
48
49=== modified file 'systemimage/testing/dbus.py'
50--- systemimage/testing/dbus.py 2013-11-12 19:57:39 +0000
51+++ systemimage/testing/dbus.py 2013-12-04 16:58:17 +0000
52@@ -116,14 +116,15 @@
53 self.UpdateAvailableStatus(
54 True, self._auto_download, '42', 1337 * 1024 * 1024,
55 '1983-09-13T12:13:14',
56- #[
57- #{'description': 'Ubuntu Edge support',
58- # 'description-en_GB': 'change the background colour',
59- # 'description-fr': "Support d'Ubuntu Edge",
60- #},
61- #{'description':
62- # 'Flipped container with 200% boot speed improvement',
63- #"}],
64+ [
65+ {'description': 'Ubuntu Edge support',
66+ 'description-en_GB': 'change the background colour',
67+ 'description-fr': "Support d'Ubuntu Edge",
68+ },
69+ {'description':
70+ 'Flipped container with 200% boot speed improvement',
71+ }
72+ ],
73 '')
74 if ( self._auto_download and
75 not self._downloading and
76@@ -214,14 +215,15 @@
77 self.UpdateAvailableStatus(
78 True, False, '42', 1337 * 1024 * 1024,
79 '1983-09-13T12:13:14',
80- #[
81- #{'description': 'Ubuntu Edge support',
82- # 'description-en_GB': 'change the background colour',
83- # 'description-fr': "Support d'Ubuntu Edge",
84- #},
85- #{'description':
86- # 'Flipped container with 200% boot speed improvement',
87- #}],
88+ [
89+ {'description': 'Ubuntu Edge support',
90+ 'description-en_GB': 'change the background colour',
91+ 'description-fr': "Support d'Ubuntu Edge",
92+ },
93+ {'description':
94+ 'Flipped container with 200% boot speed improvement',
95+ }
96+ ],
97 msg)
98 if self._failure_count > 0:
99 self._failure_count += 1
100@@ -243,14 +245,15 @@
101 self.UpdateAvailableStatus(
102 True, False, '42', 1337 * 1024 * 1024,
103 '1983-09-13T12:13:14',
104- #[
105- #{'description': 'Ubuntu Edge support',
106- # 'description-en_GB': 'change the background colour',
107- # 'description-fr': "Support d'Ubuntu Edge",
108- #},
109- #{'description':
110- # 'Flipped container with 200% boot speed improvement',
111- #}],
112+ [
113+ {'description': 'Ubuntu Edge support',
114+ 'description-en_GB': 'change the background colour',
115+ 'description-fr': "Support d'Ubuntu Edge",
116+ },
117+ {'description':
118+ 'Flipped container with 200% boot speed improvement',
119+ },
120+ ],
121 '')
122 self.UpdateDownloaded()
123
124@@ -272,14 +275,15 @@
125 self.UpdateAvailableStatus(
126 True, False, '42', 1337 * 1024 * 1024,
127 '1983-09-13T12:13:14',
128- #[
129- #{'description': 'Ubuntu Edge support',
130- # 'description-en_GB': 'change the background colour',
131- # 'description-fr': "Support d'Ubuntu Edge",
132- #},
133- #{'description':
134- # 'Flipped container with 200% boot speed improvement',
135- #}],
136+ [
137+ {'description': 'Ubuntu Edge support',
138+ 'description-en_GB': 'change the background colour',
139+ 'description-fr': "Support d'Ubuntu Edge",
140+ },
141+ {'description':
142+ 'Flipped container with 200% boot speed improvement',
143+ }
144+ ],
145 '')
146 self.UpdatePaused(42)
147
148@@ -298,14 +302,15 @@
149 self.UpdateAvailableStatus(
150 True, True, '42', 1337 * 1024 * 1024,
151 '1983-09-13T12:13:14',
152- #[
153- #{'description': 'Ubuntu Edge support',
154- # 'description-en_GB': 'change the background colour',
155- # 'description-fr': "Support d'Ubuntu Edge",
156- #},
157- #{'description':
158- # 'Flipped container with 200% boot speed improvement',
159- #}],
160+ [
161+ {'description': 'Ubuntu Edge support',
162+ 'description-en_GB': 'change the background colour',
163+ 'description-fr': "Support d'Ubuntu Edge",
164+ },
165+ {'description':
166+ 'Flipped container with 200% boot speed improvement',
167+ }
168+ ],
169 '')
170 self.UpdateProgress(10, 0)
171
172@@ -327,14 +332,15 @@
173 self.UpdateAvailableStatus(
174 False, False, '', 0,
175 '1983-09-13T12:13:14',
176- #[
177- #{'description': 'Ubuntu Edge support',
178- # 'description-en_GB': 'change the background colour',
179- # 'description-fr': "Support d'Ubuntu Edge",
180- #},
181- #{'description':
182- # 'Flipped container with 200% boot speed improvement',
183- #}],
184+ [
185+ {'description': 'Ubuntu Edge support',
186+ 'description-en_GB': 'change the background colour',
187+ 'description-fr': "Support d'Ubuntu Edge",
188+ },
189+ {'description':
190+ 'Flipped container with 200% boot speed improvement',
191+ }
192+ ],
193 '')
194
195
196
197=== modified file 'systemimage/tests/test_dbus.py'
198--- systemimage/tests/test_dbus.py 2013-11-12 22:55:55 +0000
199+++ systemimage/tests/test_dbus.py 2013-12-04 16:58:17 +0000
200@@ -300,7 +300,7 @@
201 # There's one boolean argument to the result.
202 (is_available, downloading, available_version, update_size,
203 last_update_date,
204- #descriptions,
205+ descriptions,
206 error_reason) = reactor.signals[0]
207 self.assertTrue(is_available)
208 self.assertFalse(downloading)
209@@ -308,7 +308,7 @@
210 self.assertEqual(update_size, 314572800)
211 # This is the first update applied.
212 self.assertEqual(last_update_date, 'Unknown')
213- ## self.assertEqual(descriptions, [{'description': 'Full'}])
214+ self.assertEqual(descriptions, [{'description': 'Full'}])
215 self.assertEqual(error_reason, '')
216
217 def test_update_available_auto_download(self):
218@@ -320,7 +320,7 @@
219 # There's one boolean argument to the result.
220 (is_available, downloading, available_version, update_size,
221 last_update_date,
222- # descriptions,
223+ descriptions,
224 error_reason) = reactor.signals[0]
225 self.assertTrue(is_available)
226 self.assertTrue(downloading)
227@@ -328,7 +328,7 @@
228 self.assertEqual(update_size, 314572800)
229 # This is the first update applied.
230 self.assertEqual(last_update_date, 'Unknown')
231- ## self.assertEqual(descriptions, [{'description': 'Full'}])
232+ self.assertEqual(descriptions, [{'description': 'Full'}])
233 self.assertEqual(error_reason, '')
234
235 def test_no_update_available(self):
236@@ -342,7 +342,7 @@
237 self.assertEqual(len(reactor.signals), 1)
238 (is_available, downloading, available_version, update_size,
239 last_update_date,
240- #descriptions,
241+ descriptions,
242 error_reason) = reactor.signals[0]
243 self.assertFalse(is_available)
244 # No update has been previously applied.
245@@ -367,14 +367,13 @@
246 self.assertEqual(len(reactor.signals), 1)
247 (is_available, downloading, available_version, update_size,
248 last_update_date,
249- #descriptions,
250+ descriptions,
251 error_reason) = reactor.signals[0]
252 self.assertFalse(is_available)
253 # No update has been previously applied.
254 self.assertEqual(last_update_date, '2013-01-20 12:01:45')
255 # All other values are undefined.
256
257- @unittest.skip('LP: #1215586')
258 def test_get_multilingual_descriptions(self):
259 # The descriptions are multilingual.
260 self._prepare_index('index_14.json')
261@@ -415,7 +414,7 @@
262 # There's one boolean argument to the result.
263 (is_available, downloading, available_version, update_size,
264 last_update_date,
265- #descriptions,
266+ descriptions,
267 error_reason) = reactor.signals[0]
268 self.assertTrue(is_available)
269 self.assertTrue(downloading)
270@@ -448,7 +447,7 @@
271 # There's one boolean argument to the result.
272 (is_available, downloading, available_version, update_size,
273 last_update_date,
274- #descriptions,
275+ descriptions,
276 error_reason) = reactor.signals[0]
277 self.assertFalse(is_available)
278 self.assertFalse(downloading)
279@@ -469,7 +468,7 @@
280 # There's one boolean argument to the result.
281 (is_available, downloading, available_version, update_size,
282 last_update_date,
283- #descriptions,
284+ descriptions,
285 error_reason) = reactor.signals[0]
286 self.assertTrue(is_available)
287 # This is false because we're in manual download mode.
288@@ -508,7 +507,7 @@
289 # There's one boolean argument to the result.
290 (is_available, downloading, available_version, update_size,
291 last_update_date,
292- #descriptions,
293+ descriptions,
294 error_reason) = reactor.signals[0]
295 self.assertFalse(is_available)
296 # This is false because we're in manual download mode.
297@@ -550,7 +549,7 @@
298 self.assertEqual(len(reactor.signals), 1)
299 (is_available, downloading, available_version, update_size,
300 last_update_date,
301- #descriptions,
302+ descriptions,
303 error_reason) = reactor.signals[0]
304 self.assertTrue(is_available)
305 self.assertFalse(downloading)
306@@ -675,7 +674,7 @@
307 self.assertEqual(len(reactor.signals), 1)
308 (is_available, downloading, available_version, update_size,
309 last_update_date,
310- #descriptions,
311+ descriptions,
312 error_reason) = reactor.signals[0]
313 self.assertTrue(is_available)
314 self.assertFalse(downloading)
315@@ -752,21 +751,21 @@
316 reactor.run()
317 (is_available, downloading, available_version, update_size,
318 last_update_date,
319- #descriptions,
320+ descriptions,
321 error_reason) = reactor.status
322 self.assertTrue(is_available)
323 self.assertTrue(downloading)
324 self.assertEqual(available_version, '42')
325 self.assertEqual(update_size, 1337 * 1024 * 1024)
326 self.assertEqual(last_update_date, '1983-09-13T12:13:14')
327- ## self.assertEqual(descriptions, [
328- ## {'description': 'Ubuntu Edge support',
329- ## 'description-en_GB': 'change the background colour',
330- ## 'description-fr': "Support d'Ubuntu Edge",
331- ## },
332- ## {'description':
333- ## 'Flipped container with 200% boot speed improvement',
334- ## }])
335+ self.assertEqual(descriptions, [
336+ {'description': 'Ubuntu Edge support',
337+ 'description-en_GB': 'change the background colour',
338+ 'description-fr': "Support d'Ubuntu Edge",
339+ },
340+ {'description':
341+ 'Flipped container with 200% boot speed improvement',
342+ }])
343 self.assertEqual(error_reason, '')
344 # We should have gotten 100 UpdateProgress signals, where each
345 # increments the percentage by 1 and decrements the eta by 0.5.
346@@ -878,21 +877,21 @@
347 reactor.run()
348 (is_available, downloading, available_version, update_size,
349 last_update_date,
350- #descriptions,
351+ descriptions,
352 error_reason) = reactor.status
353 self.assertTrue(is_available)
354 self.assertFalse(downloading)
355 self.assertEqual(available_version, '42')
356 self.assertEqual(update_size, 1337 * 1024 * 1024)
357 self.assertEqual(last_update_date, '1983-09-13T12:13:14')
358- ## self.assertEqual(descriptions, [
359- ## {'description': 'Ubuntu Edge support',
360- ## 'description-en_GB': 'change the background colour',
361- ## 'description-fr': "Support d'Ubuntu Edge",
362- ## },
363- ## {'description':
364- ## 'Flipped container with 200% boot speed improvement',
365- ## }])
366+ self.assertEqual(descriptions, [
367+ {'description': 'Ubuntu Edge support',
368+ 'description-en_GB': 'change the background colour',
369+ 'description-fr': "Support d'Ubuntu Edge",
370+ },
371+ {'description':
372+ 'Flipped container with 200% boot speed improvement',
373+ }])
374 self.assertEqual(error_reason, '')
375 # There should be no progress yet.
376 self.assertEqual(len(reactor.progress), 0)
377@@ -926,21 +925,21 @@
378 reactor.run()
379 (is_available, downloading, available_version, update_size,
380 last_update_date,
381- #descriptions,
382+ descriptions,
383 error_reason) = reactor.status
384 self.assertTrue(is_available)
385 self.assertFalse(downloading)
386 self.assertEqual(available_version, '42')
387 self.assertEqual(update_size, 1337 * 1024 * 1024)
388 self.assertEqual(last_update_date, '1983-09-13T12:13:14')
389- ## self.assertEqual(descriptions, [
390- ## {'description': 'Ubuntu Edge support',
391- ## 'description-en_GB': 'change the background colour',
392- ## 'description-fr': "Support d'Ubuntu Edge",
393- ## },
394- ## {'description':
395- ## 'Flipped container with 200% boot speed improvement',
396- ## }])
397+ self.assertEqual(descriptions, [
398+ {'description': 'Ubuntu Edge support',
399+ 'description-en_GB': 'change the background colour',
400+ 'description-fr': "Support d'Ubuntu Edge",
401+ },
402+ {'description':
403+ 'Flipped container with 200% boot speed improvement',
404+ }])
405 self.assertEqual(error_reason, 'You need some network for downloading')
406 self.assertEqual(len(reactor.failed), 1)
407 failure_count, reason = reactor.failed[0]
408@@ -960,21 +959,21 @@
409 reactor.run()
410 (is_available, downloading, available_version, update_size,
411 last_update_date,
412- #descriptions,
413+ descriptions,
414 error_reason) = reactor.status
415 self.assertTrue(is_available)
416 self.assertFalse(downloading)
417 self.assertEqual(available_version, '42')
418 self.assertEqual(update_size, 1337 * 1024 * 1024)
419 self.assertEqual(last_update_date, '1983-09-13T12:13:14')
420- ## self.assertEqual(descriptions, [
421- ## {'description': 'Ubuntu Edge support',
422- ## 'description-en_GB': 'change the background colour',
423- ## 'description-fr': "Support d'Ubuntu Edge",
424- ## },
425- ## {'description':
426- ## 'Flipped container with 200% boot speed improvement',
427- ## }])
428+ self.assertEqual(descriptions, [
429+ {'description': 'Ubuntu Edge support',
430+ 'description-en_GB': 'change the background colour',
431+ 'description-fr': "Support d'Ubuntu Edge",
432+ },
433+ {'description':
434+ 'Flipped container with 200% boot speed improvement',
435+ }])
436 self.assertEqual(error_reason, '')
437 self.assertTrue(reactor.downloaded)
438 reactor = SignalCapturingReactor('Rebooting')
439@@ -995,21 +994,21 @@
440 reactor.run()
441 (is_available, downloading, available_version, update_size,
442 last_update_date,
443- #descriptions,
444+ descriptions,
445 error_reason) = reactor.status
446 self.assertTrue(is_available)
447 self.assertFalse(downloading)
448 self.assertEqual(available_version, '42')
449 self.assertEqual(update_size, 1337 * 1024 * 1024)
450 self.assertEqual(last_update_date, '1983-09-13T12:13:14')
451- ## self.assertEqual(descriptions, [
452- ## {'description': 'Ubuntu Edge support',
453- ## 'description-en_GB': 'change the background colour',
454- ## 'description-fr': "Support d'Ubuntu Edge",
455- ## },
456- ## {'description':
457- ## 'Flipped container with 200% boot speed improvement',
458- ## }])
459+ self.assertEqual(descriptions, [
460+ {'description': 'Ubuntu Edge support',
461+ 'description-en_GB': 'change the background colour',
462+ 'description-fr': "Support d'Ubuntu Edge",
463+ },
464+ {'description':
465+ 'Flipped container with 200% boot speed improvement',
466+ }])
467 self.assertEqual(error_reason, '')
468 # The download is already paused.
469 self.assertEqual(len(reactor.pauses), 1)
470@@ -1039,21 +1038,21 @@
471 reactor.run()
472 (is_available, downloading, available_version, update_size,
473 last_update_date,
474- #descriptions,
475+ descriptions,
476 error_reason) = reactor.status
477 self.assertTrue(is_available)
478 self.assertTrue(downloading)
479 self.assertEqual(available_version, '42')
480 self.assertEqual(update_size, 1337 * 1024 * 1024)
481 self.assertEqual(last_update_date, '1983-09-13T12:13:14')
482- ## self.assertEqual(descriptions, [
483- ## {'description': 'Ubuntu Edge support',
484- ## 'description-en_GB': 'change the background colour',
485- ## 'description-fr': "Support d'Ubuntu Edge",
486- ## },
487- ## {'description':
488- ## 'Flipped container with 200% boot speed improvement',
489- ## }])
490+ self.assertEqual(descriptions, [
491+ {'description': 'Ubuntu Edge support',
492+ 'description-en_GB': 'change the background colour',
493+ 'description-fr': "Support d'Ubuntu Edge",
494+ },
495+ {'description':
496+ 'Flipped container with 200% boot speed improvement',
497+ }])
498 self.assertEqual(error_reason, '')
499 self.assertEqual(len(reactor.progress), 1)
500 percentage, eta = reactor.progress[0]
501@@ -1073,7 +1072,7 @@
502 self.assertEqual(len(reactor.signals), 1)
503 (is_available, downloading, available_version, update_size,
504 last_update_date,
505- #descriptions,
506+ descriptions,
507 error_reason) = reactor.signals[0]
508 self.assertFalse(is_available)
509 self.assertFalse(downloading)
510@@ -1161,7 +1160,7 @@
511 self.assertEqual(len(reactor.signals), 1)
512 (is_available, downloading, available_version, update_size,
513 last_update_date,
514- #descriptions,
515+ descriptions,
516 error_reason) = reactor.signals[0]
517 self.assertTrue(is_available)
518 self.assertFalse(downloading)
519@@ -1180,7 +1179,7 @@
520 self.assertEqual(len(reactor.signals), 1)
521 (is_available, downloading, available_version, update_size,
522 last_update_date,
523- #descriptions,
524+ descriptions,
525 error_reason) = reactor.signals[0]
526 self.assertTrue(is_available)
527 self.assertFalse(downloading)
528@@ -1419,7 +1418,7 @@
529 # There's one boolean argument to the result.
530 (is_available, downloading, available_version, update_size,
531 last_update_date,
532- #descriptions,
533+ descriptions,
534 error_reason) = reactor.signals[0]
535 self.assertTrue(is_available)
536 self.assertTrue(downloading)

Subscribers

People subscribed via source and target branches