Merge lp:~bregma/unity/lp-1435830 into lp:unity

[Stephen M. Webb]

fixed the Panel title string expected by Launcher keynav AP tests

Fixes the Panel title string expected by Launcher keynav AP tests.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3930
http://jenkins.qa.ubuntu.com/job/unity-ci/1172/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/60
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/59
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/59

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

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

As discussed on IRC, the reason this test now fails is due to LIM being enabled. A design decision was made to not display the tooltip string in the Panel when LIM is enabled.

Although I think this design makes no sense since what is displayed in the Panel in Launcher keynav mode should have nothing to do with LIM being enabled or not, but I disgress. At any rate, this needs fixing.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3931
http://jenkins.qa.ubuntu.com/job/unity-ci/1174/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/62/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/61
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/61

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3931
http://jenkins.qa.ubuntu.com/job/unity-ci/1177/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/65
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/64
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/64

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

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

Ok. I still think the design is silly and I'd like to know where this is defined (besides in someone's head).

review: Approve

=== modified file 'tests/autopilot/unity/tests/launcher/test_keynav.py'
--- tests/autopilot/unity/tests/launcher/test_keynav.py	2014-01-23 15:51:46 +0000
+++ tests/autopilot/unity/tests/launcher/test_keynav.py	2015-03-26 12:58:26 +0000
@@ -241,7 +241,12 @@
         self.assertThat(self.unity.launcher.key_nav_is_active, Eventually(Equals(False)))
 
     def test_launcher_keynav_changes_panel(self):
-      """The panel title must change when in key nav mode."""
+        """The panel title must change when in key nav mode
+           and LIM is not enabled.
+        """
 
-      self.start_keynav_with_cleanup_cancel()
-      self.assertThat(self.unity.panels.get_active_panel().title, Eventually(Equals("Search your computer and online sources")))
+        self.start_keynav_with_cleanup_cancel()
+        panel = self.unity.panels.get_active_panel()
+        expected_panel_title = ("" if panel.menus.integrated_menus
+                                else "Search your computer and online sources")
+        self.assertThat(panel.title, Eventually(Equals(expected_panel_title)))