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

[PS Jenkins bot]

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

[PS Jenkins bot (ps-jenkins)]

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)

[PS Jenkins bot (ps-jenkins)]

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)

=== 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 @@
-unity (7.0.0daily13.04.18~13.04-0ubuntu1) raring; urgency=low
-
-  [ Manuel de la Pena ]
-  * Purchased songs won't download when not logged to U1 (LP: #1168674)
-
-  [ Ubuntu daily release ]
-  * Automatic snapshot from revision 3309
-
- -- Ubuntu daily release <[e-mail]>  Thu, 18 Apr 2013 05:43:34 +0000
-
-unity (7.0.0daily13.04.17~13.04-0ubuntu1) raring; urgency=low
-
-  [ Marco Trevisan (Treviño) ]
-  * Top Bar, window managment - top bar shadow not falling on restored
-    windows that are partially off the top edge of the screen (LP:
-    #871758)
-
-  [ Matthieu James ]
-  * [UIFe] BFB icon swirl should run clockwise not anti-clockwise (LP:
-    #1169238)
-
-  [ Ubuntu daily release ]
-  * Automatic snapshot from revision 3305
-
- -- Ubuntu daily release <[e-mail]>  Wed, 17 Apr 2013 04:07:04 +0000
-
+<<<<<<< TREE
+unity (7.0.0daily13.04.18~13.04-0ubuntu1) raring; urgency=low
+
+  [ Manuel de la Pena ]
+  * Purchased songs won't download when not logged to U1 (LP: #1168674)
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 3309
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 18 Apr 2013 05:43:34 +0000
+
+unity (7.0.0daily13.04.17~13.04-0ubuntu1) raring; urgency=low
+
+  [ Marco Trevisan (Treviño) ]
+  * Top Bar, window managment - top bar shadow not falling on restored
+    windows that are partially off the top edge of the screen (LP:
+    #871758)
+
+  [ Matthieu James ]
+  * [UIFe] BFB icon swirl should run clockwise not anti-clockwise (LP:
+    #1169238)
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 3305
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 17 Apr 2013 04:07:04 +0000
+
+=======
+unity (7.0.0daily13.05.01.1ubuntu.unity.next-0ubuntu1) raring; urgency=low
+
+  [ Sebastien Bacher ]
+  * Some untranslatable and wrong strings in the previews (LP: #1074038)
+
+  [ Andrea Azzarone ]
+  * [alt-tab] Disable detail view for webapp icons. (LP: #1169340)
+
+  [ Marco Trevisan (Treviño) ]
+  * Launcher - count label pops out in auto-hide mode (LP: #1171476)
+  * Panel shadow is drawn above full-screen windows when notifications
+    are shown (LP: #1171934)
+  * [regression] Icon count is not shown if the icon is not transformed
+    (LP: #1171663)
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 3315 (ubuntu-unity/next)
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 01 May 2013 21:59:17 +0000
+
+unity (7.0.0daily13.04.18~13.04-0ubuntu1) raring; urgency=low
+
+  [ Manuel de la Pena ]
+  * Purchased songs won't download when not logged to U1 (LP: #1168674)
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 3309
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 18 Apr 2013 05:43:34 +0000
+
+unity (7.0.0daily13.04.17~13.04-0ubuntu1) raring; urgency=low
+
+  [ Marco Trevisan (Treviño) ]
+  * Top Bar, window managment - top bar shadow not falling on restored
+    windows that are partially off the top edge of the screen (LP:
+    #871758)
+
+  [ Matthieu James ]
+  * [UIFe] BFB icon swirl should run clockwise not anti-clockwise (LP:
+    #1169238)
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 3305
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 17 Apr 2013 04:07:04 +0000
+
+>>>>>>> MERGE-SOURCE
 unity (7.0.0daily13.04.15-0ubuntu1) raring; urgency=low
 
   [ Brandon Schaefer ]

=== 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 @@
         }
         self.launch_test_window(window_spec)
 
+    def start_menu_app(self):
+        window_spec = {
+            "Title": "Test menu application",
+            "Menu": ["Entry 1", "Entry 2", "Entry 3", "Entry 4", "Entry 5", "Quit"],
+        }
+        self.launch_test_window(window_spec)
+
+
 
 class HudBehaviorTests(HudTestsBase):
 
@@ -83,16 +91,20 @@
         self.assertThat(self.unity.hud.selected_button, Equals(0))
 
     def test_check_a_values(self):
+        self.start_menu_app()
         self.unity.hud.ensure_visible()
-        self.keyboard.type('a')
-        self.assertThat(self.unity.hud.search_string, Eventually(Equals('a')))
+        self.keyboard.type('e')
+        self.assertThat(self.unity.hud.search_string, Eventually(Equals('e')))
         self.assertThat(self.unity.hud.num_buttons, Eventually(Equals(5)))
         self.assertThat(self.unity.hud.selected_button, Eventually(Equals(1)))
 
     def test_up_down_arrows(self):
+        self.start_menu_app()
         self.unity.hud.ensure_visible()
-        self.keyboard.type('a')
-        self.assertThat(self.unity.hud.search_string, Eventually(Equals('a')))
+        self.keyboard.type('e')
+        self.assertThat(self.unity.hud.search_string, Eventually(Equals('e')))
+        self.assertThat(self.unity.hud.num_buttons, Eventually(Equals(5)))
+
         self.keyboard.press_and_release('Down')
         self.assertThat(self.unity.hud.selected_button, Eventually(Equals(2)))
         self.keyboard.press_and_release('Down')
@@ -120,6 +132,8 @@
         """Hud must not change selected button when results update over time."""
         # TODO - this test doesn't test anything. Onmy system the results never update.
         # ideally we'd send artificial results to the hud from the test.
+        self.skipTest("This test makes no sense in its current state, needs reworking.")
+
         self.unity.hud.ensure_visible()
         self.keyboard.type('is')
         self.assertThat(self.unity.hud.search_string, Eventually(Equals('is')))
@@ -198,8 +212,10 @@
 
         self.keyboard.type("undo")
         hud_query_check = lambda: self.unity.hud.selected_hud_button.label_no_formatting
+        # XXX: with the new HUD, command and description is separated by '\u2002' and
+        #  not a regular space ' '. Is that correct? (LP: #1172237)
         self.assertThat(hud_query_check,
-                        Eventually(Equals("Edit > Undo")))
+                        Eventually(Equals(u'Undo\u2002(Edit)')))
         self.keyboard.press_and_release('Return')
         self.assertThat(self.unity.hud.visible, Eventually(Equals(False)))
 
@@ -306,8 +322,11 @@
 
         self.unity.hud.ensure_visible()
 
-        self.keyboard.type("File > Quit")
-        self.assertThat(self.unity.hud.search_string, Eventually(Equals("File > Quit")))
+        self.keyboard.type("Quit")
+        self.assertThat(self.unity.hud.search_string, Eventually(Equals("Quit")))
+        hud_query_check = lambda: self.unity.hud.selected_hud_button.label_no_formatting
+        self.assertThat(hud_query_check,
+                        Eventually(Equals(u'Quit\u2002(File)')))
 
         self.keyboard.press_and_release("Enter")
 
@@ -368,10 +387,11 @@
         """This tests moves the mouse from the top of the screen to the bottom, this must
         change the selected button from 1 to 5.
         """
-
+        self.start_menu_app()
         self.unity.hud.ensure_visible()
 
-        self.keyboard.type("a")
+        self.keyboard.type("e")
+        self.assertThat(self.unity.hud.num_buttons, Eventually(Equals(5)))
         (x,y,w,h) = self.unity.hud.view.geometry
 
         # Specify a slower rate so that HUD can register the mouse movement properly
@@ -385,10 +405,11 @@
         """This tests moves the mouse from the top of the screen to the bottom,
         then it presses the keyboard up 5 times, this must change the selected button from 5 to 1.
         """
-
+        self.start_menu_app()
         self.unity.hud.ensure_visible()
 
-        self.keyboard.type("a")
+        self.keyboard.type("e")
+        self.assertThat(self.unity.hud.num_buttons, Eventually(Equals(5)))
         (x,y,w,h) = self.unity.hud.view.geometry
 
         self.mouse.move(w/2, 0)
@@ -462,13 +483,13 @@
 
     def test_mouse_does_not_steal_button_focus(self):
         """When typing in the hud the mouse must not steal button focus."""
-
+        self.start_menu_app()
         self.unity.hud.ensure_visible()
 
         (x,y,w,h) = self.unity.hud.view.geometry
         self.mouse.move(w/4, h/4)
 
-        self.keyboard.type("a")
+        self.keyboard.type("e")
         self.assertThat(self.unity.hud.view.selected_button, Eventually(Equals(1)))