Ubuntu UI Toolkit

Merge lp://qastaging/~zsombi/ubuntu-ui-toolkit/datepicker-fix1287009 into lp://qastaging/ubuntu-ui-toolkit

  1. datepicker-fix1287009
  2. Merge into trunk
Proposed by Zsombor Egri
Status: Merged
Approved by: Cris Dywan
Approved revision: 971
Merged at revision: 968
Proposed branch: lp://qastaging/~zsombi/ubuntu-ui-toolkit/datepicker-fix1287009
Merge into: lp://qastaging/ubuntu-ui-toolkit
Diff against target: 952 lines (+227/-150)
12 files modified
components.api (+3/-0)
modules/Ubuntu/Components/Pickers/DatePicker.qml (+16/-0)
modules/Ubuntu/Components/Pickers/Picker.qml (+66/-0)
modules/Ubuntu/Components/Pickers/PickerDelegate.qml (+1/-1)
modules/Ubuntu/Components/Pickers/PickerModelBase.qml (+8/-1)
modules/Ubuntu/Components/Pickers/PickerRow.qml (+46/-3)
modules/Ubuntu/Components/Pickers/SecondsModel.qml (+2/-2)
modules/Ubuntu/Components/Themes/Ambiance/PickerDelegateStyle.qml (+1/-1)
modules/Ubuntu/Components/plugin/quickutils.cpp (+3/-0)
tests/resources/pickers/DatePickerTest.qml (+5/-0)
tests/resources/pickers/PickerTest.qml (+6/-0)
tests/unit_x11/tst_components/tst_datepicker.qml (+70/-142)
To merge this branch: bzr merge lp://qastaging/~zsombi/ubuntu-ui-toolkit/datepicker-fix1287009
Reviewer Review Type Date Requested Status
Cris Dywan Approve
PS Jenkins bot continuous-integration Approve
Timo Jyrinki Approve
Review via email: mp+209641@code.qastaging.launchpad.net

Commit message

DatePicker flaky test fix.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:970
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1840/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3708
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3299
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/788
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/788
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/788/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3258
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3713
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3713/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3301
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3301/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5669
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4520

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1840/rebuild

review: Approve (continuous-integration)
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Fixes the issue in the landing PPA: https://launchpad.net/~ci-train-ppa-service/+archive/landing-006/+sourcepub/3958525/+listing-archive-extra

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:971
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1845/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3728
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3319
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/793
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/793
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/793/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3278
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3733
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3733/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3321
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3321/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5690
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4546

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1845/rebuild

review: Approve (continuous-integration)
Revision history for this message
Cris Dywan (kalikiana) wrote :

I'm liking waitPickerMoving and your use of the loader status. So much cleaner and keeps the tests readable.

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

to status/vote changes: