summaryrefslogtreecommitdiff
path: root/tests/autopilot
diff options
authorChris Townsend <christopher.townsend@canonical.com>2014-02-28 19:52:50 +0000
committerCI bot <ps-jenkins@lists.canonical.com>2014-02-28 19:52:50 +0000
commitf6d0d77b6956cf1165bb34319e70a3812aa7ad94 (patch)
treee11516b53e76a96af164fe1254c581400644dbac /tests/autopilot
parent8558c8c9cdf1c5fbbf514c7194d86b518a9e1734 (diff)
parentcd3268ce3735eaa4a5cbd26cf78f221448649731 (diff)
Fix a couple of Panel Autopilot test failures. Fixes: 1285737
(bzr r3689)
Diffstat (limited to 'tests/autopilot')
-rw-r--r--tests/autopilot/unity/tests/test_panel.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/autopilot/unity/tests/test_panel.py b/tests/autopilot/unity/tests/test_panel.py
index ff0e63c21..cd8fdeaf1 100644
--- a/tests/autopilot/unity/tests/test_panel.py
+++ b/tests/autopilot/unity/tests/test_panel.py
@@ -856,6 +856,7 @@ class PanelMenuTests(PanelTestsBase):
"""Applications with no menus must not show menus in the panel."""
test_win = self.launch_test_window()
+ self.move_window_to_panel_monitor(test_win)
self.assertThat(
lambda: len(self.panel.menus.get_entries()),
@@ -868,6 +869,11 @@ class PanelMenuTests(PanelTestsBase):
def test_menus_shows_when_new_application_is_opened(self):
"""When starting a new application, menus must first show, then hide."""
+ # This test requires the window to be opened on the monitor that is being tested and
+ # we cannot guarantee which monitor the window will open up on.
+ if self.panel_monitor > 0:
+ self.skipTest("Cannot guarantee which monitor the window will open on.")
+
self.start_test_app_with_menus()
self.assertThat(self.panel.menus_shown, Eventually(Equals(True)))