Ubuntu UI Toolkit

Merge lp:~zsombi/ubuntu-ui-toolkit/statesaver-path into lp:ubuntu-ui-toolkit/staging

  1. statesaver-path
  2. Merge into staging
Proposed by Zsombor Egri
Status: Merged
Approved by: Zsombor Egri
Approved revision: 1183
Merged at revision: 1182
Proposed branch: lp:~zsombi/ubuntu-ui-toolkit/statesaver-path
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 24 lines (+2/-2)
2 files modified
modules/Ubuntu/Components/plugin/statesaverbackend_p.cpp (+1/-1)
tests/unit_x11/tst_statesaver/tst_statesaver.cpp (+1/-1)
To merge this branch: bzr merge lp:~zsombi/ubuntu-ui-toolkit/statesaver-path
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Cris Dywan Approve
Review via email: mp+229762@code.launchpad.net

Commit message

StateSaver to save state files to runtime location instead of /tmp folder.

To post a comment you must log in.
Revision history for this message
Cris Dywan (kalikiana) wrote :

Obviously correct.

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

FAILED: Continuous integration, rev:1183
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/734/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3097
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2434
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/566
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/566
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/566/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/566
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3134
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4340
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4340/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11078
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2014
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2704
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2704/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/734/rebuild

review: Needs Fixing (continuous-integration)
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-sdk-team-ubuntu-ui-toolkit-staging-autolanding/320/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3101
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2435
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-autolanding/264
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/264
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/264/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-autolanding/264
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3138
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4345
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4345/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11083
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2016
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2705
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2705/artifact/work/output/*zip*/output.zip

review: Needs Fixing (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 'modules/Ubuntu/Components/plugin/statesaverbackend_p.cpp'
2--- modules/Ubuntu/Components/plugin/statesaverbackend_p.cpp 2014-07-28 17:52:16 +0000
3+++ modules/Ubuntu/Components/plugin/statesaverbackend_p.cpp 2014-08-06 10:55:32 +0000
4@@ -70,7 +70,7 @@
5 applicationName = UCApplication::instance().applicationName();
6 }
7 m_archive = new QSettings(QString("%1/%2.state")
8- .arg(QStandardPaths::standardLocations(QStandardPaths::TempLocation)[0])
9+ .arg(QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation))
10 .arg(applicationName), QSettings::NativeFormat);
11 m_archive->setFallbacksEnabled(false);
12 }
13
14=== modified file 'tests/unit_x11/tst_statesaver/tst_statesaver.cpp'
15--- tests/unit_x11/tst_statesaver/tst_statesaver.cpp 2014-07-28 14:46:19 +0000
16+++ tests/unit_x11/tst_statesaver/tst_statesaver.cpp 2014-08-06 10:55:32 +0000
17@@ -78,7 +78,7 @@
18 QString stateFile(const QString &appId)
19 {
20 return QString("%1/%2.state")
21- .arg(QStandardPaths::standardLocations(QStandardPaths::TempLocation)[0])
22+ .arg(QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation))
23 .arg(appId);
24 }
25

Subscribers

People subscribed via source and target branches