@@ -49,41 +49,34 @@ class TestHud(Unity8TestCase):
4949 """Swiping up while an app is active must show the 'show hud' button."""
5050 self.launch_unity()
5151 self.main_window.get_greeter().unlock()
52−
5352 window = self.main_window.get_qml_view()
5453 hud_show_button = self.main_window.get_hud_show_button()
5554 hud = self.main_window.get_hud()
5655
57− swipe_coords = self._get_hud_button_swipe_coords(window, hud_show_button)
58−
5956 self._launch_application_from_app_screen()
6057
58+ swipe_coords = self._get_hud_button_swipe_coords(window, hud_show_button)
6159 self.touch.press(swipe_coords.start_x, swipe_coords.start_y)
6260 self.addCleanup(self.touch.release)
6361 self.touch._finger_move(swipe_coords.end_x, swipe_coords.end_y)
64−
65− hud_show_button.opacity.wait_for(1.0)
6662 self.assertThat(hud_show_button.opacity, Eventually(Equals(1.0)))
6763
6864 def test_show_hud_appears(self):
6965 """Releasing the touch on the 'show hud' button must display the hud."""
7066 self.launch_unity()
7167 self.main_window.get_greeter().unlock()
72−
7368 window = self.main_window.get_qml_view()
7469 hud_show_button = self.main_window.get_hud_show_button()
7570 hud = self.main_window.get_hud()
7671
77− swipe_coords = self._get_hud_button_swipe_coords(window, hud_show_button)
78−
7972 self._launch_application_from_app_screen()
8073
74+ swipe_coords = self._get_hud_button_swipe_coords(window, hud_show_button)
8175 self.touch.press(swipe_coords.start_x, swipe_coords.start_y)
8276 self.addCleanup(self._maybe_release_finger)
8377 self.touch._finger_move(swipe_coords.end_x, swipe_coords.end_y)
8478
8579 self.assertThat(hud.shown, Eventually(Equals(False)))
86− hud_show_button.opacity.wait_for(1.0)
8780 self.assertThat(hud_show_button.opacity, Eventually(Equals(1.0)))
8881 self.touch.release()
8982 self.assertThat(hud.shown, Eventually(Equals(True)))
@@ -125,10 +118,11 @@ class TestHud(Unity8TestCase):
125118 """Tapping the close button of the Hud must dismiss it."""
126119 self.launch_unity()
127120 self.main_window.get_greeter().unlock()
128− self._launch_application_from_app_screen()
129121 hud = self.main_window.get_hud()
130122 hud.show()
131123
124+ self._launch_application_from_app_screen()
125+
132126 rect = hud.globalRect
133127 x = int(rect[0] + rect[2] / 2)
134128 y = rect[1] + self.grid_size
@@ -162,10 +156,11 @@ class TestHud(Unity8TestCase):
162156 """Opening the Launcher while the Hud is active must close the Hud."""
163157 self.launch_unity()
164158 self.main_window.get_greeter().unlock()
165− self._launch_application_from_app_screen()
166159 hud = self.main_window.get_hud()
167160 launcher = self.main_window.get_launcher()
168161
162+ self._launch_application_from_app_screen()
163+
169164 hud.show()
170165 launcher.show()
171166
@@ -195,7 +190,6 @@ class TestHud(Unity8TestCase):
195190 if self.touch._touch_finger is not None:
196191 self.touch.release()
197192
198−
199193 def _get_hud_button_swipe_coords(self, main_view, hud_show_button):
200194 start_x = int(main_view.x + (main_view.width / 2))
201195 end_x = start_x