ubuntu-system-settings

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

  1. autopilot_workaround_dialog
  2. Merge into trunk
Proposed by Ken VanDine on 2015-01-15
Status: Merged
Approved by: Ken VanDine on 2015-01-16
Approved revision: 1259
Merged at revision: 1261
Proposed branch: lp:~ken-vandine/ubuntu-system-settings/autopilot_workaround_dialog
Merge into: lp:ubuntu-system-settings
Diff against target: 32 lines (+11/-0)
2 files modified
debian/control (+1/-0)
tests/autopilot/ubuntu_system_settings/__init__.py (+10/-0)
To merge this branch: bzr merge lp:~ken-vandine/ubuntu-system-settings/autopilot_workaround_dialog
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2015-01-16
Leo Arias (community) Approve on 2015-01-15
Ubuntu Touch System Settings 2015-01-15 Pending
Review via email: mp+246612@code.launchpad.net

Commit Message

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

Description of the Change

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

To post a comment you must log in.
Leo Arias (elopio) wrote :

looks good. But please confirm that the tests are all passing before landing :)

review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
lp:~ken-vandine/ubuntu-system-settings/autopilot_workaround_dialog updated on 2015-01-15
1258. By Ken VanDine on 2015-01-15

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

1259. By Ken VanDine on 2015-01-15

Make ubuntu-system-settings-autopilot explicitly depend on python3-evdev

PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1259
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1907/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/829
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/177
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/722
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/827
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/827/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17132

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

review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1259
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1910/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/832/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/180
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/725/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/830
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/830/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17137

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

review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1259
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1911/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/833
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/181
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/726
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/831
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/831/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17142

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

review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1259
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1914/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/845
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/184
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/738
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/843
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/843/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17167

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

review: Approve (continuous-integration)
Leo Arias (elopio) wrote :

All green!!! thanks Ken.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2015-01-14 00:00:41 +0000
3+++ debian/control 2015-01-15 19:53:20 +0000
4@@ -133,6 +133,7 @@
5 python3-autopilot,
6 python3-dbusmock (>= 0.10.1),
7 python3-dateutil,
8+ python3-evdev,
9 libautopilot-qt,
10 ubuntu-ui-toolkit-autopilot,
11 dpkg-dev,
12
13=== modified file 'tests/autopilot/ubuntu_system_settings/__init__.py'
14--- tests/autopilot/ubuntu_system_settings/__init__.py 2015-01-10 06:50:50 +0000
15+++ tests/autopilot/ubuntu_system_settings/__init__.py 2015-01-15 19:53:20 +0000
16@@ -207,6 +207,16 @@
17 self._orientation_lock_switch.uncheck()
18
19
20+class Dialog(ubuntuuitoolkit.Dialog):
21+ # XXX A new Dialog custom proxy object was added to the toolkit.
22+ # Because of https://bugs.launchpad.net/autopilot-qt/+bug/1341671
23+ # we need to make sure it does not match in any selection.
24+
25+ @classmethod
26+ def validate_dbus_object(cls, path, state):
27+ return False
28+
29+
30 class CellularPage(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
31
32 """Autopilot helper for the Cellular page."""

Subscribers

People subscribed via source and target branches