Ubuntu Clock App

Merge lp://qastaging/~nik90/ubuntu-clock-app/use-default-swipe-delete into lp://qastaging/ubuntu-clock-app/saucy

  1. use-default-swipe-delete
  2. Merge into saucy
Proposed by Nekhelesh Ramananthan
Status: Merged
Approved by: Nekhelesh Ramananthan
Approved revision: 262
Merged at revision: 262
Proposed branch: lp://qastaging/~nik90/ubuntu-clock-app/use-default-swipe-delete
Merge into: lp://qastaging/ubuntu-clock-app/saucy
Diff against target: 702 lines (+165/-309)
11 files modified
alarm/AlarmPage.qml (+1/-8)
clock/ClockPage.qml (+4/-12)
clock/WorldClock.qml (+1/-0)
common/SwipeDelete.qml (+0/-67)
stopwatch/LapList.qml (+4/-9)
tests/autopilot/ubuntu_clock_app/emulators.py (+75/-75)
tests/autopilot/ubuntu_clock_app/tests/test_alarm.py (+2/-0)
tests/autopilot/ubuntu_clock_app/tests/test_clock.py (+35/-58)
tests/autopilot/ubuntu_clock_app/tests/test_stopwatch.py (+2/-7)
tests/autopilot/ubuntu_clock_app/tests/test_timer.py (+40/-65)
timer/PresetList.qml (+1/-8)
To merge this branch: bzr merge lp://qastaging/~nik90/ubuntu-clock-app/use-default-swipe-delete
Reviewer Review Type Date Requested Status
Nicholas Skaggs (community) Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Ubuntu Clock Developers Pending
Review via email: mp+191905@code.qastaging.launchpad.net

Commit message

Adds confirm to delete option to clock, alarm, timer and stopwatch. It also removes the custom swipe delete class since it is now provided by the SDK. Autopilot tests have been fixed, cleaned and ported to Autopilot 1.4. They also make more use of upstream UITK emulator functions.

Description of the change

This MP implements the following,

UI Change
- Adds confirm to delete option to clock, alarm, timer and stopwatch.
- It removes the custom swipe delete class since it is now provided by the SDK.

Autopilot Tests
- Ports clock app autopilot tests to 1.4 which results in less assert statements and other improvements.
- Emulator function and test cases clean up
- It also improves the testing logic of the delete_local_world_city() testcase.

2 Autopilot tests test_delete_local_world_city() and test_delete_preset() are failing due to bug https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1245651. Wait until this is fixed before merging.

Another point worth noting is that the alarm test cases have not been ported to 1.4. However the alarm tests are skipped until the Alarm features matures and is more stable. This should happen in the upcoming weeks at which point the alarm test cases will also be updated.

To post a comment you must log in.
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

Requesting nskaggs review of autopilot tests. Tests fail due to the upstream confirm_removal() function. Logs shown in http://paste.ubuntu.com/6318817/. Consistent failure in other places as well.

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

FAILED: Continuous integration, rev:253
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/84/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/1231
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/84
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/84
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/2

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

This looks good, but I'm getting failures on my desktop using it ;-( I see the lab has some failures also. I'll dig in to see what's up in a minute if you believe this to be working.

The changes to get rid of "get_button_x" are good, as is the swipe to delete :-)

Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

I am getting failures in the tests ubuntu_clock_app.tests.test_clock.TestClock.test_add_remove_world_location(with mouse) and ubuntu_clock_app.tests.test_timer.TestTimer.test_delete_preset(with mouse) as the lab suggests. This is due to the confirm_delete() upstream function we discussed on IRC. Other tests should pass.

Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Let's await the fix for the upstream confirm delete issue. nik90 can you add a comment with a link to the bug once it's been filed?

review: Needs Fixing
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

MP is frozen until https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1245651 is fixed. Until then porting is autopilot 1.4 is being implemented.

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

FAILED: Continuous integration, rev:259
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/87/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/87/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/87/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/5

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

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

FAILED: Continuous integration, rev:259
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/90/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/88
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/90
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/90
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/8

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

review: Needs Fixing (continuous-integration)
lp://qastaging/~nik90/ubuntu-clock-app/use-default-swipe-delete updated
260. By Nekhelesh Ramananthan

Added an additional assert statement to ensure that world city list is available before returning it

261. By Nekhelesh Ramananthan

reverted previous commit

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

FAILED: Continuous integration, rev:260
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/91/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/93
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/91
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/91
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/9

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

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

FAILED: Continuous integration, rev:261
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/92/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/94
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/92
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/92
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/10

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

review: Needs Fixing (continuous-integration)
lp://qastaging/~nik90/ubuntu-clock-app/use-default-swipe-delete updated
262. By Nekhelesh Ramananthan

Fixed add local city test failure

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

FAILED: Continuous integration, rev:262
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/95/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/97
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/95
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/95
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/13

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

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

FAILED: Continuous integration, rev:262
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/98/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/113
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/98
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/98
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/16

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

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

FAILED: Continuous integration, rev:262
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/99/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/125
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/99
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/99
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/17

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

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

FAILED: Continuous integration, rev:262
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/100/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/150
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/100
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/100
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/18

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

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

FAILED: Continuous integration, rev:262
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/102/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/176
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/102
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/102
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/20

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Leo says the emulator has landed and thus this should work very shortly :-) Perhaps tomorrow :-)

Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

Yup it landed 20 hours ago. Waiting on the update to land in the jenkins machine :-).

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

PASSED: Continuous integration, rev:262
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/103/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/191
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/103
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/103
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/21

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

review: Approve (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches