Unity

Merge lp:~chris.gagnon/unity/fix-display-import-in-autopilot-test into lp:unity

  1. fix-display-import-in-autopilot-test
  2. Merge into trunk
Proposed by Chris Gagnon
Status: Merged
Approved by: Andrea Azzarone
Approved revision: no longer in the source branch.
Merged at revision: 3525
Proposed branch: lp:~chris.gagnon/unity/fix-display-import-in-autopilot-test
Merge into: lp:unity
Diff against target: 12 lines (+1/-1)
1 file modified
tests/autopilot/unity/tests/launcher/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~chris.gagnon/unity/fix-display-import-in-autopilot-test
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+186653@code.launchpad.net

Commit message

BlackListDriverError moved to Display

Description of the change

update location of BlackListDriverError in autopilot launcher test

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3522
http://jenkins.qa.ubuntu.com/job/unity-ci/380/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/269
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/267
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/268

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

review: Approve (continuous-integration)
Revision history for this message
Andrea Azzarone (azzar1) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/unity/tests/launcher/__init__.py'
2--- tests/autopilot/unity/tests/launcher/__init__.py 2013-05-02 15:51:41 +0000
3+++ tests/autopilot/unity/tests/launcher/__init__.py 2013-09-19 20:46:14 +0000
4@@ -50,7 +50,7 @@
5 old_primary_screen = self.display.get_primary_screen()
6 set_primary_monitor(self.launcher_monitor)
7 self.addCleanup(set_primary_monitor, old_primary_screen)
8- except autopilot.display.BlacklistedDriverError:
9+ except Display.BlacklistedDriverError:
10 self.skipTest("Impossible to set the monitor %d as primary" % self.launcher_monitor)
11
12 def get_launcher(self):