Merge lp:~veebers/autopilot/minor-fix-failing-tests into lp:autopilot

Proposed by Thomi Richards
Status: Merged
Approved by: Thomi Richards
Approved revision: 171
Merged at revision: 168
Proposed branch: lp:~veebers/autopilot/minor-fix-failing-tests
Merge into: lp:autopilot
Diff against target: 18 lines (+2/-2)
1 file modified
autopilot/tests/test_matchers.py (+2/-2)
To merge this branch: bzr merge lp:~veebers/autopilot/minor-fix-failing-tests
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Thomi Richards (community) Approve
Review via email: mp+160003@code.launchpad.net

This proposal supersedes a proposal from 2013-04-22.

Commit message

Fix several autopilot tests.

Description of the change

A couple of tests were failing due to some recent changes (to the d-bus wire protocol and launching apps).
This MP fixes them.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:170
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~veebers/autopilot/minor-fix-failing-tests/+merge/160003/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/autopilot-ci/33/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-raring-amd64-ci/33
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-raring-armhf-ci/32

Click here to trigger a rebuild:
http://s-jenkins:8080/job/autopilot-ci/33/rebuild

review: Needs Fixing (continuous-integration)
171. By Christopher Lee

Backout bad changes

Revision history for this message
Thomi Richards (thomir-deactivatedaccount) :
review: Approve
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 'autopilot/tests/test_matchers.py'
2--- autopilot/tests/test_matchers.py 2012-12-07 03:44:20 +0000
3+++ autopilot/tests/test_matchers.py 2013-04-22 05:18:25 +0000
4@@ -34,12 +34,12 @@
5 """
6 class FakeObject(DBusIntrospectionObject):
7 def __init__(self, props):
8- super(FakeObject, self).__init__(props)
9+ super(FakeObject, self).__init__(props, "/FakeObject")
10 FakeObject._fake_props = props
11
12 @classmethod
13 def get_state_by_path(cls, piece):
14- return [('FakeObject', cls._fake_props)]
15+ return [('/FakeObject', cls._fake_props)]
16
17 if attribute_type == 'callable':
18 return lambda: result

Subscribers

People subscribed via source and target branches