Merge lp:~sil2100/unity/autopilot_misc_changes into lp:unity

[Łukasz Zemczak]

Fix two HUD failures related to HUD slow action activation

- Problem:

Some of the HUD autopilot tests are failing because the HUD takes too long to activate entries. See LP: #1180903.

- Fix:

First of all, in the undo test, we need to wait a bit after activating the "Undo" HUD entry before saving. Since activation takes a while and the test checks the file contents, we need to make sure that the undo action takes place before Ctrl+s is pressed.
The other fix uses Eventually() to check if the application has quit, as it might take a bit for the action to take place.

- Tests:

N/A

[Mathieu Trudel-Lapierre (cyphermox)]

Approve. Makes sense to me, will go well with the other timing changes I've proposed.

review: Approve

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3325
http://jenkins.qa.ubuntu.com/job/unity-ci/75/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-ci/79
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-ci/75

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

review: Needs Fixing (continuous-integration)

[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-02 00:22:30 +0000
+++ tests/autopilot/unity/tests/test_hud.py	2013-05-17 16:37:36 +0000
@@ -212,14 +212,15 @@
 
         self.keyboard.type("undo")
         hud_query_check = lambda: self.unity.hud.selected_hud_button.label_no_formatting
-        # XXX: with the new HUD, command and description is separated by '\u2002' and
-        #  not a regular space ' '. Is that correct? (LP: #1172237)
         self.assertThat(hud_query_check,
                         Eventually(Equals(u'Undo\u2002(Edit)')))
         self.keyboard.press_and_release('Return')
         self.assertThat(self.unity.hud.visible, Eventually(Equals(False)))
 
         self.assertProperty(gedit_win, is_focused=True)
+        # XXX: Because of LP: #1180903, we need to give HUD some time after activating
+        #   any entry, because it takes some time
+        sleep(1.5)
         self.keyboard.press_and_release("Ctrl+s")
         self.assertThat(lambda: exists(file_path), Eventually(Equals(True)))
 
@@ -330,7 +331,8 @@
 
         self.keyboard.press_and_release("Enter")
 
-        self.assertFalse(self.process_manager.app_is_running("Text Editor"))
+        is_running = lambda: self.process_manager.app_is_running("Text Editor")
+        self.assertThat(is_running, Eventually(Equals(False)))
 
         self.assertThat(self.unity.hud.visible, Eventually(Equals(False)))