Merge lp:~townsend/unity/fix-lp1287745 into lp:unity

[Christopher Townsend]

Fix more Panel Autopilot test failures.

This MP fixes the following failures:

1. Some Panel tests will fail if the previous test leaves the system with only the Launcher on the primary monitor. * To fix this, make sure the Launcher is in all monitors before the tests run.

2. test_window_buttons_show_when_holding_show_menu_key can fail due to a race when pressing and releasing the Alt key. This sometimes opens the Hud during the test which is not expected.
* Add a short delay before the test releases the Alt key to avoid the Hud opening.

3. test_hovering_indicators_on_multiple_monitors fails due to a change in how multi-monitor Panels are handled. The test needs fixed to account for the new behavior.
* Move the chunk of code to open the session indicator to the loop so this will occur for each monitor.
* At the end of the loop, add a mouse click to close the last indicator opened so the next iteration can open the indicator on its monitor.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3696
http://jenkins.qa.ubuntu.com/job/unity-ci/753/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/289
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/285
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/287

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/753/rebuild

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

=== modified file 'tests/autopilot/unity/tests/test_panel.py'
--- tests/autopilot/unity/tests/test_panel.py	2014-02-27 15:49:20 +0000
+++ tests/autopilot/unity/tests/test_panel.py	2014-03-04 15:43:33 +0000
@@ -154,6 +154,12 @@
 
     scenarios = _make_monitor_scenarios()
 
+    def setUp(self):
+        super(PanelTitleTests, self).setUp()
+        # Locked Launchers on all monitors
+        self.set_unity_option('num_launchers', 0)
+        self.set_unity_option('launcher_hide_mode', 0)
+
     def test_panel_title_on_empty_desktop(self):
         """With no windows shown, the panel must display the default title."""
         gettext.install("unity", unicode=True)
@@ -648,6 +654,8 @@
 
         self.assertThat(self.panel.window_buttons_shown, Eventually(Equals(True)))
 
+        # Sleep a bit to avoid a race with the Hud showing
+        sleep(0.5)
         self.keybinding_release("panel/show_menus")
         self.assertThat(self.panel.window_buttons_shown, Eventually(Equals(False)))
 
@@ -1307,14 +1315,14 @@
 
     def test_hovering_indicators_on_multiple_monitors(self):
         """Opening an indicator entry and then hovering others entries must open them."""
-        text_win = self.open_new_application_window("Text Editor")
-        panel = self.unity.panels.get_panel_for_monitor(text_win.monitor)
-        indicator = panel.indicators.get_indicator_by_name_hint("indicator-session")
-        self.mouse_open_indicator(indicator)
+        self.open_new_application_window("Text Editor")
 
         for monitor in range(0, self.display.get_num_screens()):
             panel = self.unity.panels.get_panel_for_monitor(monitor)
 
+            indicator = panel.indicators.get_indicator_by_name_hint("indicator-session")
+            self.mouse_open_indicator(indicator)
+
             entries = panel.get_indicator_entries(include_hidden_menus=True)
             self.assertThat(len(entries), GreaterThan(0))
 
@@ -1330,3 +1338,6 @@
                     self.assertThat(entry.visible, Eventually(Equals(True)))
                     self.assertThat(entry.active, Eventually(Equals(True)))
                     self.assertThat(entry.menu_y, Eventually(NotEquals(0)))
+
+            # Close the last indicator on the monitor
+            self.mouse.click()