Merge lp:~unity-team/unity/hud-tests-to-wait into lp:unity

[Brandon Schaefer]

Hud autopilot tests use the new Eventually autopilot matcher to reduce the number of test failures due to timing issues.

Fixed 2 ap test failing from this branch:
https://code.launchpad.net/~thomir/unity/hud-tests-to-wait_for-feature/+merge/102436

Made the HUD tests use the wait_for feature. This fixes several tests that failed intermittently due to timing issues (even on my machine). In some places Unity exports properties as arrays. The only way to use wait_for with an array is to use MatchesListwise with a dummy matcher. This is important, since without this hack the tests sometimes fail.

[Thomi Richards (thomir)]

+1

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

[Unity Merger (unity-merger)]

Attempt to merge into lp:unity failed due to conflicts:

text conflict in tests/autopilot/autopilot/tests/test_hud.py

[Thomi Richards (thomir)]

+2

review: Approve

[Unity Merger (unity-merger)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Thomi Richards (thomir)]

+3

review: Approve

[lp:~unity-team/unity/hud-tests-to-wait]

2254. By Thomi Richards on 2012-04-19

Merged trunk, resolved conflicts.

[Thomi Richards (thomir)]

+4

review: Approve

=== modified file 'tests/autopilot/autopilot/tests/test_dash.py'
--- tests/autopilot/autopilot/tests/test_dash.py	2012-04-18 23:02:10 +0000
+++ tests/autopilot/autopilot/tests/test_dash.py	2012-04-19 02:30:26 +0000
@@ -178,26 +178,6 @@
         # Make sure that the category is highlighted.
         self.assertTrue(category.header_is_highlighted)
 
-    def test_maintain_highlight(self):
-        # Get the geometry of that category header.
-        self.skipTest('Not implemented at all. Broken out of another test but not reworked')
-        mouse = Mouse()
-
-        x = category.header_x
-        y = category.header_y
-        w = category.header_width
-        h = category.header_height
-
-        # Move the mouse close the view, and press down.
-        mouse.move(x + w + 10,
-                    y + h / 2,
-                    True)
-        sleep(1)
-        self.keyboard.press_and_release("Down")
-        lens = self.dash.get_current_lens()
-        category = lens.get_focused_category()
-        self.assertEqual(category, None)
-
     def test_control_tab_lens_cycle(self):
         """This test makes sure that Ctrl+Tab cycles lenses."""
         self.dash.ensure_visible()
@@ -262,7 +242,9 @@
         """This test that Alt+F1 is disabled when the dash is opened."""
         self.dash.ensure_visible()
 
-        self.keybinding("launcher/keynav")
+        launcher = self.launcher.get_launcher_for_monitor(0)
+        launcher.key_nav_start()
+
         self.assertThat(self.launcher.key_nav_is_active, Equals(False))
 
 
@@ -421,7 +403,6 @@
         activate_filter(True)
         self.addCleanup(activate_filter)
 
-        sleep(1)
         results_category = lens.get_category_by_name("Installed")
         results = results_category.get_results()
         self.assertIsNot(results, old_results)
@@ -466,6 +447,7 @@
         self.mouse.move(app_icon.x + (app_icon.width / 2),
                         app_icon.y + (app_icon.height / 2))
         self.mouse.click()
+
         self.assertThat(self.lensbar.active_lens, Eventually(Equals('applications.lens')))
 
 
@@ -506,31 +488,3 @@
 
         self.assertThat(self.dash.visible, Eventually(Equals(True)))
 
-class DashRestoreFocus(DashTestCase):
-    """Tests that the dash restores focus on exit."""
-    def setUp(self):
-        super(DashRestoreFocus,self).setUp()
-
-    def test_dash_restores_window_focus(self):
-        """Make sure the dash restores the last focused window."""
-        calc = self.start_app("Calculator")
-        [calc_win] = calc.get_windows()
-        self.assertTrue(calc_win.is_focused)
-
-        self.dash.ensure_visible()
-        self.dash.ensure_hidden()
-
-        self.assertTrue(calc_win.is_focused)
-
-    def test_hud_to_dash_restores_window_focus(self):
-        """Make sure the hud->dash restores the last focused window."""
-        calc = self.start_app("Calculator")
-        [calc_win] = calc.get_windows()
-        self.assertTrue(calc_win.is_focused)
-
-        self.keybinding("hud/reveal")
-        self.dash.ensure_visible()
-        self.dash.ensure_hidden()
-
-        self.assertTrue(calc_win.is_focused)
-

=== modified file 'tests/autopilot/autopilot/tests/test_hud.py'
--- tests/autopilot/autopilot/tests/test_hud.py	2012-04-18 22:47:44 +0000
+++ tests/autopilot/autopilot/tests/test_hud.py	2012-04-19 02:30:26 +0000
@@ -192,8 +192,7 @@
         """Pressing Alt+F1 when the HUD is open must not start keyboard navigation mode."""
         self.hud.ensure_visible()
 
-        launcher = self.launcher.get_launcher_for_monitor(0)
-        launcher.key_nav_start()
+        self.keybinding("launcher/keynav")
         # we need a sleep here to ensure that the launcher has had time to start
         # keynav before we check the key_nav_is_active attribute.
         #
@@ -208,9 +207,8 @@
         self.hud.ensure_visible()
         self.dash.ensure_visible()
         self.addCleanup(self.dash.ensure_hidden)
-
-        launcher = self.launcher.get_launcher_for_monitor(0)
-        launcher.key_nav_start()
+    
+        self.keybinding("launcher/keynav")
         self.assertThat(self.launcher.key_nav_is_active, Equals(False))
 
     def test_hud_to_dash_has_key_focus(self):