Keeper

Merge lp:~xavi-garcia-mena/keeper/wait-ual-timer-increased into lp:keeper/devel

  1. wait-ual-timer-increased
  2. Merge into devel
Proposed by Xavi Garcia
Status: Merged
Approved by: Xavi Garcia
Approved revision: 108
Merge reported by: Xavi Garcia
Merged at revision: not available
Proposed branch: lp:~xavi-garcia-mena/keeper/wait-ual-timer-increased
Merge into: lp:keeper/devel
Diff against target: 47 lines (+4/-4)
3 files modified
include/helper/backup-helper.h (+1/-1)
include/helper/helper.h (+1/-1)
tests/integration/helpers/helpers-test.cc (+2/-2)
To merge this branch: bzr merge lp:~xavi-garcia-mena/keeper/wait-ual-timer-increased
Reviewer Review Type Date Requested Status
unity-api-1-bot continuous-integration Needs Fixing
Charles Kerr (community) Approve
Review via email: mp+305575@code.launchpad.net

Commit message

Increased the maximum time to wait for the UAL started signal to 5 seconds. After testing with the phone I saw 1 second was not enough.

Description of the change

Increased the maximum time to wait for the UAL started signal to 5 seconds. After testing with the phone I saw 1 second was not enough.

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:107
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/57/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/627
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/633
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/451
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/451/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/451
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/451/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/451
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/451/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/451
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/451/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/451
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/451/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/451
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/451/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/451
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/451/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/451
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/451/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/451
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/451/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/57/rebuild

review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

LGTM. Optional suggestion inline

review: Approve
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:108
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/58/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/630
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/636
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/454
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/454/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/454
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/454/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/454
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/454/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/454
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/454/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/454
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/454/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/454
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/454/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/454
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/454/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/454
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/454/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/454
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/454/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/58/rebuild

review: Approve (continuous-integration)
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-autoland/9/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/659/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/665
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/480
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/480/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/480
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/480/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/480
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/480/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/480
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/480/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/480/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/480
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/480/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/480
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/480/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/480
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/480/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/480
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/480/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/helper/backup-helper.h'
2--- include/helper/backup-helper.h 2016-09-12 15:13:33 +0000
3+++ include/helper/backup-helper.h 2016-09-13 15:18:20 +0000
4@@ -45,7 +45,7 @@
5 virtual ~BackupHelper();
6 Q_DISABLE_COPY(BackupHelper)
7
8- static constexpr int MAX_INACTIVITY_TIME = 10000;
9+ static constexpr int MAX_INACTIVITY_TIME = 15000;
10
11 void set_uploader(std::shared_ptr<Uploader> const& uploader);
12 void start(QStringList const& urls) override;
13
14=== modified file 'include/helper/helper.h'
15--- include/helper/helper.h 2016-09-12 15:13:33 +0000
16+++ include/helper/helper.h 2016-09-13 15:18:20 +0000
17@@ -64,7 +64,7 @@
18 virtual void start(QStringList const& urls);
19 virtual void stop();
20
21- static constexpr int MAX_UAL_WAIT_TIME = 1000;
22+ static constexpr int MAX_UAL_WAIT_TIME = 5000;
23
24 Q_SIGNALS:
25 void state_changed(Helper::State);
26
27=== modified file 'tests/integration/helpers/helpers-test.cc'
28--- tests/integration/helpers/helpers-test.cc 2016-09-13 08:47:14 +0000
29+++ tests/integration/helpers/helpers-test.cc 2016-09-13 15:18:20 +0000
30@@ -156,7 +156,7 @@
31 urls << "blah" << "/tmp";
32 helper.start(urls);
33
34- WAIT_FOR_SIGNALS(spy, 1, 5000);
35+ WAIT_FOR_SIGNALS(spy, 1, Helper::MAX_UAL_WAIT_TIME + 1000);
36
37 ASSERT_EQ(spy.count(), 1);
38 QList<QVariant> arguments = spy.takeFirst();
39@@ -179,7 +179,7 @@
40 // the inactive helper sleeps for 100 seconds so
41 // if we get the 2 signals it means it was stopped due to inactivity
42 // We can also check at the end for the state, which should be CANCELLED
43- WAIT_FOR_SIGNALS(spy, 2, 15000);
44+ WAIT_FOR_SIGNALS(spy, 2, BackupHelper::MAX_INACTIVITY_TIME + 2000);
45
46 ASSERT_EQ(spy.count(), 2);
47 QList<QVariant> arguments = spy.takeFirst();

Subscribers

People subscribed via source and target branches

to all changes: