Ubuntu UI Toolkit

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

  1. stateSaverWithRepeater
  2. Merge into trunk
Proposed by Zsombor Egri
Status: Merged
Approved by: Florian Boucault
Approved revision: 915
Merged at revision: 914
Proposed branch: lp://qastaging/~zsombi/ubuntu-ui-toolkit/stateSaverWithRepeater
Merge into: lp://qastaging/ubuntu-ui-toolkit
Diff against target: 320 lines (+254/-2)
6 files modified
modules/Ubuntu/Components/plugin/ucstatesaver.cpp (+31/-1)
tests/unit_x11/tst_statesaver/GridViewItems.qml (+38/-0)
tests/unit_x11/tst_statesaver/ListViewItems.qml (+38/-0)
tests/unit_x11/tst_statesaver/RepeaterStates.qml (+40/-0)
tests/unit_x11/tst_statesaver/tst_statesaver.cpp (+103/-0)
tests/unit_x11/tst_statesaver/tst_statesaver.pro (+4/-1)
To merge this branch: bzr merge lp://qastaging/~zsombi/ubuntu-ui-toolkit/stateSaverWithRepeater
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Francis Ginther (community) Approve
Florian Boucault (community) Approve
Review via email: mp+201214@code.qastaging.launchpad.net

Commit message

StateSaver failure with Repeater fixed. Indirectly fixes StateSaver with ListView and GridView.

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

FAILED: Continuous integration, rev:915
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1571/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2249
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2134/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/519
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/519
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/519/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1972
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2251
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2251/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2134
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2134/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4593/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2992

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Florian Boucault (fboucault) wrote :

Seems good to me.

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-autolanding/558/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2257/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2142
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-autolanding/161
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-autolanding/161
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-autolanding/161/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1980/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2259
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2259/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2142
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2142/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4602
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3005

review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

The autopilot-testrunner-otto-trusty job failed due to a transient problem with lxc.

Revision history for this message
Francis Ginther (fginther) wrote :

> The autopilot-testrunner-otto-trusty job failed due to a transient problem
> with lxc.

This MP should be re-approved to retry the build.

review: Approve
Revision history for this message
Francis Ginther (fginther) wrote :

> The autopilot-testrunner-otto-trusty job failed due to a transient problem
> with lxc.

This MP should be re-approved to retry the build.

review: Approve
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
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: