Merge lp:~veebers/unity/testfix_hudvisuals_workspaces into lp:unity

[Christopher Lee]

Autopilot Hud Tests now check against active app icon, not a hardcoded value.

Problem:
The test test_dash_hud_only_uses_icon_from_current_desktop assumed there would be no apps open on the 2nd workspace (and thus used a hard-coded icon value).

Solution:
Test now checks for the active app and uses that falling back on the originally hard-coded 'launcher_bfb.png' one would find on a blank desktop.

Tests:
Ran the test a couple of times through with different apps open on the 2nd workspace as well as no apps on the 2nd workspace.

[Thomi Richards (thomir-deactivatedaccount)]

Hi,

I'm afraid this needs fixing - while you've made the test pass, it no longer tests what it says on the tin. The test is supposed to ensure that, when no active applications are found on the current desktop the HUD must use the BFB icon, rather than an application icon.

I suggest making a method in the workspace switcher emulator (in the autopilot codebase) called "move_to_blank_workspace". This method attempts to find a blank workspace and switch to it, or raises a particular exception with the message "No empty workspaces found". We should then use this everywhere where we need a blank workspace.

Does that make sense? Talk to me later if it doesn't.

review: Needs Fixing

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:2419
http://s-jenkins:8080/job/unity-ci/7/

review: Disapprove (continuous-integration)

[Martin Mrazik (mrazik)]

The jenkins above is a problem in jenkins infrastructure. Please ignore. I'll take care of it.

[Francis Ginther (fginther)]

Review was claimed by accident, please ignore.

review: Abstain

Unmerged revisions

2419. By Christopher Lee on 2012-06-18

Test now checks against active apps icon, not hardcoded

=== modified file 'tests/autopilot/unity/tests/test_hud.py'
--- tests/autopilot/unity/tests/test_hud.py	2012-05-31 00:01:22 +0000
+++ tests/autopilot/unity/tests/test_hud.py	2012-06-18 06:00:29 +0000
@@ -464,10 +464,17 @@
         calc = self.start_app("Calculator")
         self.assertTrue(calc.is_active)
         self.workspace.switch_to(2)
+        self.addCleanup(self.workspace.switch_to, 0)
+        active_app = [a for a in self.bamf.get_running_applications()
+                      if a.is_active]
+        try:
+            icon_name = active_app[0].icon
+        except IndexError:
+            icon_name = "launcher_bfb.png"
         self.dash.ensure_visible()
         self.hud.ensure_visible()
 
-        self.assertThat(self.hud.icon.icon_name, Eventually(EndsWith("launcher_bfb.png")))
+        self.assertThat(self.hud.icon.icon_name, Eventually(EndsWith(icon_name)))
 
 
 class HudAlternativeKeybindingTests(HudTestsBase):