Merge lp:~ken-vandine/ubuntu-system-settings/rtm-autopilot_workaround_dialog into lp:ubuntu-system-settings/rtm-14.09

[Ken VanDine]

Work around for the SDK's addition of a Dialog CPO, this fixes matching in test_reset

Work around for the SDK's addition of a Dialog CPO, this fixes matching in test_reset

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:965
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/40/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-14.09-touch/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/41
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/41/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-14.09-mako/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/19
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/19/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17290

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-rtm-14.09-ci/40/rebuild

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

This change needs to wait for the uitk branch which adds the Dialog CPO to land in rtm.

Unmerged revisions

965. By Ken VanDine on 2015-01-21

Work around for the SDK's addition of a Dialog CPO, this fixes matching in test_reset

=== modified file 'tests/autopilot/ubuntu_system_settings/__init__.py'
--- tests/autopilot/ubuntu_system_settings/__init__.py	2015-01-13 19:46:25 +0000
+++ tests/autopilot/ubuntu_system_settings/__init__.py	2015-01-21 15:14:51 +0000
@@ -203,6 +203,16 @@
         self._orientation_lock_switch.uncheck()
 
 
+class Dialog(ubuntuuitoolkit.Dialog):
+    # XXX A new Dialog custom proxy object was added to the toolkit.
+    # Because of https://bugs.launchpad.net/autopilot-qt/+bug/1341671
+    # we need to make sure it does not match in any selection.
+
+    @classmethod
+    def validate_dbus_object(cls, path, state):
+        return False
+
+
 class CellularPage(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 
     """Autopilot helper for the Cellular page."""