Ubuntu Clock App

Merge lp:~elopio/ubuntu-clock-app/prepare_for_page11 into lp:ubuntu-clock-app/saucy

  1. prepare_for_page11
  2. Merge into saucy
Proposed by Leo Arias
Status: Merged
Approved by: Nekhelesh Ramananthan
Approved revision: 453
Merged at revision: 452
Proposed branch: lp:~elopio/ubuntu-clock-app/prepare_for_page11
Merge into: lp:ubuntu-clock-app/saucy
Diff against target: 11 lines (+1/-1)
1 file modified
tests/autopilot/ubuntu_clock_app/emulators.py (+1/-1)
To merge this branch: bzr merge lp:~elopio/ubuntu-clock-app/prepare_for_page11
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Ubuntu Clock Developers Pending
Review via email: mp+225728@code.launchpad.net

Commit message

Change the settings page autopilot helper to work with the release of the new page version.

Description of the change

The upcoming release of ubuntu-ui-toolkit adds a new Page version. So the old version QML type is Page10, and that's what autopilot will see instead of SettingsPage as soon as that version is released.
With this change, the clock tests will remain working.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:452
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/384/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/896
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/896/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/31

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/384/rebuild

review: Approve (continuous-integration)
lp:~elopio/ubuntu-clock-app/prepare_for_page11 updated
453. By Leo Arias

This is a more clever solution.

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:453
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/385/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/897
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/897/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/32

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/385/rebuild

review: Approve (continuous-integration)
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 'tests/autopilot/ubuntu_clock_app/emulators.py'
2--- tests/autopilot/ubuntu_clock_app/emulators.py 2014-06-27 15:08:40 +0000
3+++ tests/autopilot/ubuntu_clock_app/emulators.py 2014-07-05 07:59:05 +0000
4@@ -271,7 +271,7 @@
5 @classmethod
6 def select(cls, main_view):
7 proxy_object = main_view.wait_select_single(
8- Page, objectName='settingsPage')
9+ objectName='settingsPage')
10 proxy_object.visible.wait_for(True)
11 return cls(proxy_object)
12

Subscribers

People subscribed via source and target branches