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

[Thomi Richards]

Fix several autopilot tests.

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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:170
http://jenkins.qa.ubuntu.com/job/autopilot-ci/32/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-raring-amd64-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-raring-armhf-ci/31

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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)

[lp:~veebers/autopilot/minor-fix-failing-tests]

171. By Christopher Lee on 2013-04-22

Backout bad changes

[Thomi Richards (thomir-deactivatedaccount)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'autopilot/tests/test_matchers.py'
--- autopilot/tests/test_matchers.py	2012-12-07 03:44:20 +0000
+++ autopilot/tests/test_matchers.py	2013-04-22 05:18:25 +0000
@@ -34,12 +34,12 @@
     """
     class FakeObject(DBusIntrospectionObject):
         def __init__(self, props):
-            super(FakeObject, self).__init__(props)
+            super(FakeObject, self).__init__(props, "/FakeObject")
             FakeObject._fake_props = props
 
         @classmethod
         def get_state_by_path(cls, piece):
-            return [('FakeObject', cls._fake_props)]
+            return [('/FakeObject', cls._fake_props)]
 
     if attribute_type == 'callable':
         return lambda: result