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

Proposed by Łukasz Zemczak
Status: Merged
Approved by: Francis Ginther
Approved revision: no longer in the source branch.
Merged at revision: 3305
Proposed branch: lp:~sil2100/unity/autopilot_leftover_in_hud_cleanup
Merge into: lp:unity
Diff against target: 12 lines (+1/-1)
1 file modified
tests/autopilot/unity/tests/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~sil2100/unity/autopilot_leftover_in_hud_cleanup
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Didier Roche-Tolomelli Approve
Review via email: mp+159121@code.launchpad.net

Commit message

A leftover from the self.emulator -> self.unity.emulator migration. This was causing problems with HUD cleanups

Description of the change

- Problem

Whenever a test leaves the HUD open, we get this:
AttributeError: 'PanelWindowButtonsTests' object has no attribute 'hud'

- Fix:

It's a leftover, someone didn't change self.hud to self.unity.hud in the cleanup.

- Tests:

N/A

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Thanks Lukasz

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

Had to abort the build to do a quick fix of the jenkins job. I've restarted the build.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

The armhf failure appears to be unrelated to this MP: https://bugs.launchpad.net/unity/+bug/1169714

Reapproving.

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/unity/tests/__init__.py'
2--- tests/autopilot/unity/tests/__init__.py 2013-04-09 18:37:33 +0000
3+++ tests/autopilot/unity/tests/__init__.py 2013-04-16 10:40:54 +0000
4@@ -95,7 +95,7 @@
5 well_behaved = False
6 reasons.append("The test left the hud open.")
7 log.warning("Test left the hud open, closing it...")
8- self.hud.ensure_hidden()
9+ self.unity.hud.ensure_hidden()
10 # Are we in show desktop mode?
11 if not self.well_behaved(self.unity.window_manager, showdesktop_active=False):
12 well_behaved = False