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

[Łukasz Zemczak]

Removed the test_hud_closes_on_item_activated test as the same behavior is tested already by test_app_activate_on_enter - redundant.
Made test_app_activate_on_enter work better on non-EN-locale systems by explicitly opening a C locale application for performing the tests.

- Problem:

More failing tests due to locale-dependency. Also, one of the tests is badly written and redundant.

- Fix:

Remove the badly written and redundant test, the other one we fix up by forcing to use a gedit instance for testing which we explicitly tell which locale to use - this way we achieve testability on non-EN machines.

- Tests:

N/A

[Thomi Richards (thomir-deactivatedaccount)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/111/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/111/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/111/console

review: Needs Fixing (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

The error by jenkins bot looks like a temporary jenkins failure.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/144/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/144/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/144/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/158/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/158/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/158/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/271/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/271/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=i386/271/console

review: Needs Fixing (continuous-integration)

=== modified file 'tests/autopilot/unity/tests/test_hud.py'
--- tests/autopilot/unity/tests/test_hud.py	2012-12-19 20:43:46 +0000
+++ tests/autopilot/unity/tests/test_hud.py	2013-01-04 11:37:27 +0000
@@ -299,16 +299,17 @@
 
     def test_app_activate_on_enter(self):
         """Hud must close after activating a search item with Enter."""
+        self.start_app('Text Editor', locale='C')
+        self.addCleanup(self.close_all_app, "Text Editor")
+
         self.hud.ensure_visible()
 
-        self.keyboard.type("Device > System Settings")
-        self.assertThat(self.hud.search_string, Eventually(Equals("Device > System Settings")))
+        self.keyboard.type("File > Quit")
+        self.assertThat(self.hud.search_string, Eventually(Equals("File > Quit")))
 
         self.keyboard.press_and_release("Enter")
 
-        app_found = self.bamf.wait_until_application_is_running("gnome-control-center.desktop", 5)
-        self.assertTrue(app_found)
-        self.addCleanup(self.close_all_app,  "System Settings")
+        self.assertFalse(self.app_is_running("Text Editor"))
 
         self.assertThat(self.hud.visible, Eventually(Equals(False)))
 
@@ -356,29 +357,6 @@
 
         self.assertThat(file_contents, Equals('ABCD'))
 
-    def test_hud_closes_on_item_activated(self):
-        """Activating a HUD item with the 'Enter' key MUST close the HUD."""
-        # starting on a clean desktop because this way we are sure that our search
-        # string won't match any menu item from a focused application
-        self.start_placeholder_app()
-        self.window_manager.enter_show_desktop()
-        self.addCleanup(self.window_manager.leave_show_desktop)
-
-        self.hud.ensure_visible()
-
-        self.keyboard.type("settings")
-        self.assertThat(self.hud.search_string, Eventually(Equals("settings")))
-
-        self.keyboard.press_and_release('Down')
-        self.assertThat(self.hud.selected_button, Eventually(Equals(2)))
-        self.keyboard.press_and_release('Down')
-        self.assertThat(self.hud.selected_button, Eventually(Equals(3)))
-        self.keyboard.press_and_release('Enter')
-
-        self.addCleanup(self.close_all_app,  "System Settings")
-
-        self.assertThat(self.hud.visible, Eventually(Equals(False)))
-
     def test_mouse_changes_selected_hud_button(self):
         """This tests moves the mouse from the top of the screen to the bottom, this must
         change the selected button from 1 to 5.