Merge lp:~fginther/unity/autopilot_hud_button_label_fixes into lp:unity

[Francis Ginther]

Handle StateNotFoundError when querying the label of a hud button.

Handle StateNotFoundError when querying the label of a hud button.

When querying the contents of the hud and the button lables, buttons may be destroyed as the contents change. This ignores the StateNotFoundError and allows the query logic to keep trying.

[Łukasz Zemczak (sil2100)]

Awesome, thanks Francis! Indeed this can happen here as well. Good catch!

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/unity/tests/test_hud.py'
--- tests/autopilot/unity/tests/test_hud.py	2013-05-22 02:14:27 +0000
+++ tests/autopilot/unity/tests/test_hud.py	2013-05-22 02:14:27 +0000
@@ -12,6 +12,7 @@
 from autopilot.matchers import Eventually
 from autopilot.display import Display, move_mouse_to_screen, is_rect_on_screen
 from autopilot.testcase import multiply_scenarios
+from autopilot.introspection.dbus import StateNotFoundError
 from os import remove, environ
 from os.path import exists
 from tempfile import mktemp
@@ -73,6 +74,14 @@
         }
         self.launch_test_window(window_spec)
 
+    def hud_query_check(self):
+        try:
+            button = self.unity.hud.selected_hud_button
+            if not button:
+                return
+            return button.label_no_formatting
+        except StateNotFoundError:
+            return
 
 
 class HudBehaviorTests(HudTestsBase):
@@ -210,13 +219,7 @@
 
         self.keyboard.type("save")
 
-        def hud_query_check():
-            button = self.unity.hud.selected_hud_button
-            if not button:
-                return
-            return button.label_no_formatting
-
-        self.assertThat(hud_query_check,
+        self.assertThat(self.hud_query_check,
                         Eventually(Equals(u'Save\u2002(File)')))
         self.keyboard.press_and_release('Return')
         self.addCleanup(self.keyboard.press_and_release, "Ctrl+s")
@@ -323,14 +326,7 @@
 
         self.keyboard.type("Quit")
         self.assertThat(self.unity.hud.search_string, Eventually(Equals("Quit")))
-
-        def hud_query_check():
-            button = self.unity.hud.selected_hud_button
-            if not button:
-                return
-            return button.label_no_formatting
-
-        self.assertThat(hud_query_check,
+        self.assertThat(self.hud_query_check,
                         Eventually(Equals(u'Quit\u2002(File)'), timeout=30))
 
         self.keyboard.press_and_release("Enter")
 
=== modified file 'tests/autopilot/unity/tests/test_search.py'
--- tests/autopilot/unity/tests/test_search.py	2013-05-22 02:14:27 +0000
+++ tests/autopilot/unity/tests/test_search.py	2013-05-22 02:14:27 +0000
@@ -147,10 +147,13 @@
         self.keyboard.type(string)
         self.assertThat(self.unity.hud.search_string, Eventually(Equals(string), timeout=30))
         def hud_query_check():
-            button = self.unity.hud.selected_hud_button
-            if not button:
+            try:
+                button = self.unity.hud.selected_hud_button
+                if not button:
+                   return
+                return button.label_no_formatting
+            except StateNotFoundError:
                 return
-            return button.label_no_formatting
 
         self.assertThat(hud_query_check, Eventually(Equals(expected), timeout=30))