Unity

Merge lp:~ps-jenkins/unity/latestsnapshot-7.0.0daily13.05.01.1ubuntu.unity.next-0ubuntu1 into lp:unity/7.0

  1. latestsnapshot-7.0.0daily13.05.01.1ubuntu.unity.next-0ubuntu1
  2. Merge into 7.0
Proposed by PS Jenkins bot
Status: Superseded
Proposed branch: lp:~ps-jenkins/unity/latestsnapshot-7.0.0daily13.05.01.1ubuntu.unity.next-0ubuntu1
Merge into: lp:unity/7.0
Diff against target: 229 lines (+109/-39) (has conflicts)
2 files modified
debian/changelog (+75/-26)
tests/autopilot/unity/tests/test_hud.py (+34/-13)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~ps-jenkins/unity/latestsnapshot-7.0.0daily13.05.01.1ubuntu.unity.next-0ubuntu1
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Unity Team Pending
Review via email: mp+162017@code.launchpad.net

This proposal has been superseded by a proposal from 2013-05-02.

Commit message

Releasing 7.0.0daily13.05.01.1ubuntu.unity.next-0ubuntu1 to ubuntu

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-7.0-autolanding/9/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.0-raring-amd64-autolanding/9
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-7.0-raring-armhf-autolanding/9/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.0-raring-i386-autolanding/9

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3316
http://jenkins.qa.ubuntu.com/job/unity-7.0-ci/7/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.0-raring-amd64-ci/7
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-7.0-raring-armhf-ci/7/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.0-raring-i386-ci/8

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-7.0-ci/7/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2013-04-18 05:43:35 +0000
+++ debian/changelog 2013-05-02 01:18:31 +0000
@@ -1,29 +1,78 @@
1unity (7.0.0daily13.04.18~13.04-0ubuntu1) raring; urgency=low1<<<<<<< TREE
22unity (7.0.0daily13.04.18~13.04-0ubuntu1) raring; urgency=low
3 [ Manuel de la Pena ]3
4 * Purchased songs won't download when not logged to U1 (LP: #1168674)4 [ Manuel de la Pena ]
55 * Purchased songs won't download when not logged to U1 (LP: #1168674)
6 [ Ubuntu daily release ]6
7 * Automatic snapshot from revision 33097 [ Ubuntu daily release ]
88 * Automatic snapshot from revision 3309
9 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 18 Apr 2013 05:43:34 +00009
1010 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 18 Apr 2013 05:43:34 +0000
11unity (7.0.0daily13.04.17~13.04-0ubuntu1) raring; urgency=low11
1212unity (7.0.0daily13.04.17~13.04-0ubuntu1) raring; urgency=low
13 [ Marco Trevisan (Treviño) ]13
14 * Top Bar, window managment - top bar shadow not falling on restored14 [ Marco Trevisan (Treviño) ]
15 windows that are partially off the top edge of the screen (LP:15 * Top Bar, window managment - top bar shadow not falling on restored
16 #871758)16 windows that are partially off the top edge of the screen (LP:
1717 #871758)
18 [ Matthieu James ]18
19 * [UIFe] BFB icon swirl should run clockwise not anti-clockwise (LP:19 [ Matthieu James ]
20 #1169238)20 * [UIFe] BFB icon swirl should run clockwise not anti-clockwise (LP:
2121 #1169238)
22 [ Ubuntu daily release ]22
23 * Automatic snapshot from revision 330523 [ Ubuntu daily release ]
2424 * Automatic snapshot from revision 3305
25 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 17 Apr 2013 04:07:04 +000025
2626 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 17 Apr 2013 04:07:04 +0000
27
28=======
29unity (7.0.0daily13.05.01.1ubuntu.unity.next-0ubuntu1) raring; urgency=low
30
31 [ Sebastien Bacher ]
32 * Some untranslatable and wrong strings in the previews (LP: #1074038)
33
34 [ Andrea Azzarone ]
35 * [alt-tab] Disable detail view for webapp icons. (LP: #1169340)
36
37 [ Marco Trevisan (Treviño) ]
38 * Launcher - count label pops out in auto-hide mode (LP: #1171476)
39 * Panel shadow is drawn above full-screen windows when notifications
40 are shown (LP: #1171934)
41 * [regression] Icon count is not shown if the icon is not transformed
42 (LP: #1171663)
43
44 [ Ubuntu daily release ]
45 * Automatic snapshot from revision 3315 (ubuntu-unity/next)
46
47 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 01 May 2013 21:59:17 +0000
48
49unity (7.0.0daily13.04.18~13.04-0ubuntu1) raring; urgency=low
50
51 [ Manuel de la Pena ]
52 * Purchased songs won't download when not logged to U1 (LP: #1168674)
53
54 [ Ubuntu daily release ]
55 * Automatic snapshot from revision 3309
56
57 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 18 Apr 2013 05:43:34 +0000
58
59unity (7.0.0daily13.04.17~13.04-0ubuntu1) raring; urgency=low
60
61 [ Marco Trevisan (Treviño) ]
62 * Top Bar, window managment - top bar shadow not falling on restored
63 windows that are partially off the top edge of the screen (LP:
64 #871758)
65
66 [ Matthieu James ]
67 * [UIFe] BFB icon swirl should run clockwise not anti-clockwise (LP:
68 #1169238)
69
70 [ Ubuntu daily release ]
71 * Automatic snapshot from revision 3305
72
73 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 17 Apr 2013 04:07:04 +0000
74
75>>>>>>> MERGE-SOURCE
27unity (7.0.0daily13.04.15-0ubuntu1) raring; urgency=low76unity (7.0.0daily13.04.15-0ubuntu1) raring; urgency=low
2877
29 [ Brandon Schaefer ]78 [ Brandon Schaefer ]
3079
=== modified file 'tests/autopilot/unity/tests/test_hud.py'
--- tests/autopilot/unity/tests/test_hud.py 2013-03-20 22:10:59 +0000
+++ tests/autopilot/unity/tests/test_hud.py 2013-05-02 01:18:31 +0000
@@ -66,6 +66,14 @@
66 }66 }
67 self.launch_test_window(window_spec)67 self.launch_test_window(window_spec)
6868
69 def start_menu_app(self):
70 window_spec = {
71 "Title": "Test menu application",
72 "Menu": ["Entry 1", "Entry 2", "Entry 3", "Entry 4", "Entry 5", "Quit"],
73 }
74 self.launch_test_window(window_spec)
75
76
6977
70class HudBehaviorTests(HudTestsBase):78class HudBehaviorTests(HudTestsBase):
7179
@@ -83,16 +91,20 @@
83 self.assertThat(self.unity.hud.selected_button, Equals(0))91 self.assertThat(self.unity.hud.selected_button, Equals(0))
8492
85 def test_check_a_values(self):93 def test_check_a_values(self):
94 self.start_menu_app()
86 self.unity.hud.ensure_visible()95 self.unity.hud.ensure_visible()
87 self.keyboard.type('a')96 self.keyboard.type('e')
88 self.assertThat(self.unity.hud.search_string, Eventually(Equals('a')))97 self.assertThat(self.unity.hud.search_string, Eventually(Equals('e')))
89 self.assertThat(self.unity.hud.num_buttons, Eventually(Equals(5)))98 self.assertThat(self.unity.hud.num_buttons, Eventually(Equals(5)))
90 self.assertThat(self.unity.hud.selected_button, Eventually(Equals(1)))99 self.assertThat(self.unity.hud.selected_button, Eventually(Equals(1)))
91100
92 def test_up_down_arrows(self):101 def test_up_down_arrows(self):
102 self.start_menu_app()
93 self.unity.hud.ensure_visible()103 self.unity.hud.ensure_visible()
94 self.keyboard.type('a')104 self.keyboard.type('e')
95 self.assertThat(self.unity.hud.search_string, Eventually(Equals('a')))105 self.assertThat(self.unity.hud.search_string, Eventually(Equals('e')))
106 self.assertThat(self.unity.hud.num_buttons, Eventually(Equals(5)))
107
96 self.keyboard.press_and_release('Down')108 self.keyboard.press_and_release('Down')
97 self.assertThat(self.unity.hud.selected_button, Eventually(Equals(2)))109 self.assertThat(self.unity.hud.selected_button, Eventually(Equals(2)))
98 self.keyboard.press_and_release('Down')110 self.keyboard.press_and_release('Down')
@@ -120,6 +132,8 @@
120 """Hud must not change selected button when results update over time."""132 """Hud must not change selected button when results update over time."""
121 # TODO - this test doesn't test anything. Onmy system the results never update.133 # TODO - this test doesn't test anything. Onmy system the results never update.
122 # ideally we'd send artificial results to the hud from the test.134 # ideally we'd send artificial results to the hud from the test.
135 self.skipTest("This test makes no sense in its current state, needs reworking.")
136
123 self.unity.hud.ensure_visible()137 self.unity.hud.ensure_visible()
124 self.keyboard.type('is')138 self.keyboard.type('is')
125 self.assertThat(self.unity.hud.search_string, Eventually(Equals('is')))139 self.assertThat(self.unity.hud.search_string, Eventually(Equals('is')))
@@ -198,8 +212,10 @@
198212
199 self.keyboard.type("undo")213 self.keyboard.type("undo")
200 hud_query_check = lambda: self.unity.hud.selected_hud_button.label_no_formatting214 hud_query_check = lambda: self.unity.hud.selected_hud_button.label_no_formatting
215 # XXX: with the new HUD, command and description is separated by '\u2002' and
216 # not a regular space ' '. Is that correct? (LP: #1172237)
201 self.assertThat(hud_query_check,217 self.assertThat(hud_query_check,
202 Eventually(Equals("Edit > Undo")))218 Eventually(Equals(u'Undo\u2002(Edit)')))
203 self.keyboard.press_and_release('Return')219 self.keyboard.press_and_release('Return')
204 self.assertThat(self.unity.hud.visible, Eventually(Equals(False)))220 self.assertThat(self.unity.hud.visible, Eventually(Equals(False)))
205221
@@ -306,8 +322,11 @@
306322
307 self.unity.hud.ensure_visible()323 self.unity.hud.ensure_visible()
308324
309 self.keyboard.type("File > Quit")325 self.keyboard.type("Quit")
310 self.assertThat(self.unity.hud.search_string, Eventually(Equals("File > Quit")))326 self.assertThat(self.unity.hud.search_string, Eventually(Equals("Quit")))
327 hud_query_check = lambda: self.unity.hud.selected_hud_button.label_no_formatting
328 self.assertThat(hud_query_check,
329 Eventually(Equals(u'Quit\u2002(File)')))
311330
312 self.keyboard.press_and_release("Enter")331 self.keyboard.press_and_release("Enter")
313332
@@ -368,10 +387,11 @@
368 """This tests moves the mouse from the top of the screen to the bottom, this must387 """This tests moves the mouse from the top of the screen to the bottom, this must
369 change the selected button from 1 to 5.388 change the selected button from 1 to 5.
370 """389 """
371390 self.start_menu_app()
372 self.unity.hud.ensure_visible()391 self.unity.hud.ensure_visible()
373392
374 self.keyboard.type("a")393 self.keyboard.type("e")
394 self.assertThat(self.unity.hud.num_buttons, Eventually(Equals(5)))
375 (x,y,w,h) = self.unity.hud.view.geometry395 (x,y,w,h) = self.unity.hud.view.geometry
376396
377 # Specify a slower rate so that HUD can register the mouse movement properly397 # Specify a slower rate so that HUD can register the mouse movement properly
@@ -385,10 +405,11 @@
385 """This tests moves the mouse from the top of the screen to the bottom,405 """This tests moves the mouse from the top of the screen to the bottom,
386 then it presses the keyboard up 5 times, this must change the selected button from 5 to 1.406 then it presses the keyboard up 5 times, this must change the selected button from 5 to 1.
387 """407 """
388408 self.start_menu_app()
389 self.unity.hud.ensure_visible()409 self.unity.hud.ensure_visible()
390410
391 self.keyboard.type("a")411 self.keyboard.type("e")
412 self.assertThat(self.unity.hud.num_buttons, Eventually(Equals(5)))
392 (x,y,w,h) = self.unity.hud.view.geometry413 (x,y,w,h) = self.unity.hud.view.geometry
393414
394 self.mouse.move(w/2, 0)415 self.mouse.move(w/2, 0)
@@ -462,13 +483,13 @@
462483
463 def test_mouse_does_not_steal_button_focus(self):484 def test_mouse_does_not_steal_button_focus(self):
464 """When typing in the hud the mouse must not steal button focus."""485 """When typing in the hud the mouse must not steal button focus."""
465486 self.start_menu_app()
466 self.unity.hud.ensure_visible()487 self.unity.hud.ensure_visible()
467488
468 (x,y,w,h) = self.unity.hud.view.geometry489 (x,y,w,h) = self.unity.hud.view.geometry
469 self.mouse.move(w/4, h/4)490 self.mouse.move(w/4, h/4)
470491
471 self.keyboard.type("a")492 self.keyboard.type("e")
472 self.assertThat(self.unity.hud.view.selected_button, Eventually(Equals(1)))493 self.assertThat(self.unity.hud.view.selected_button, Eventually(Equals(1)))
473494
474495

Subscribers

People subscribed via source and target branches

to all changes: