Merge lp:~townsend/unity/fix-quicklist-ap-test-failure into lp:unity

[Christopher Townsend]

Use the first two icons in the Launcher to assure the icons are always on the screen for this particular Autopilot test.

= Issue =
The unity.tests.test_quicklist.QuicklistActionTests.test_right_click_opens_quicklist_if_already_open AP test assumed that the two icons being used would be on the screen. This isn't always the case since the icons may be off the screen when there are many icons in the Launcher. When it was off the screen, the AP test would go into an infinite mouse move loop trying to get to the icon.

= Fix =
Just use the first two icons in the Launcher for the test as these will always be on the screen.

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/unity/tests/test_quicklist.py'
--- tests/autopilot/unity/tests/test_quicklist.py	2013-06-19 09:11:43 +0000
+++ tests/autopilot/unity/tests/test_quicklist.py	2013-09-12 15:44:30 +0000
@@ -191,20 +191,14 @@
         lp:890991
         """
 
-        calc_win = self.process_manager.start_app_window("Calculator")
-        mahj_win = self.process_manager.start_app_window("Mahjongg")
-
-        calc_icon = self.unity.launcher.model.get_icon(
-            desktop_id=calc_win.application.desktop_file)
-        mahj_icon = self.unity.launcher.model.get_icon(
-            desktop_id=mahj_win.application.desktop_file)
-
-        calc_ql = self.open_quicklist_for_icon(calc_icon)
-        self.assertThat(calc_ql.active, Eventually(Equals(True)))
-
-        mahj_ql = self.open_quicklist_for_icon(mahj_icon)
-        self.assertThat(mahj_ql.active, Eventually(Equals(True)))
-        self.assertThat(calc_ql.active, Eventually(Equals(False)))
+        icons = self.unity.launcher.model.get_launcher_icons()
+
+        icon0_ql = self.open_quicklist_for_icon(icons[0])
+        self.assertThat(icon0_ql.active, Eventually(Equals(True)))
+
+        icon1_ql = self.open_quicklist_for_icon(icons[1])
+        self.assertThat(icon1_ql.active, Eventually(Equals(True)))
+        self.assertThat(icon0_ql.active, Eventually(Equals(False)))
 
     def test_right_clicking_same_icon_doesnt_reopen_ql(self):
         """A right click to the same icon in the launcher must