Storage Framework

Merge lp:~michihenning/storage-framework/increase-timeout into lp:storage-framework/devel

  1. increase-timeout
  2. Merge into devel
Proposed by Michi Henning
Status: Merged
Approved by: James Henstridge
Approved revision: 60
Merged at revision: 60
Proposed branch: lp:~michihenning/storage-framework/increase-timeout
Merge into: lp:storage-framework/devel
Diff against target: 27 lines (+5/-1)
2 files modified
tests/local-client/local-client_test.cpp (+3/-1)
tests/remote-client/remote-client_test.cpp (+2/-0)
To merge this branch: bzr merge lp:~michihenning/storage-framework/increase-timeout
Reviewer Review Type Date Requested Status
unity-api-1-bot continuous-integration Approve
James Henstridge Approve
Review via email: mp+303894@code.launchpad.net

Commit message

Increased test timeouts because CI builders are hopelessly overloaded.

Description of the change

Increased test timeouts because CI builders are hopelessly overloaded.

To post a comment you must log in.
Revision history for this message
James Henstridge (jamesh) wrote :

Looks good.

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

PASSED: Continuous integration, rev:60
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/94/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/478
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/484
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/389
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/389
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/389
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/319
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/319/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/319
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/319/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/319
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/319/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/319
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/319/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/319
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/319/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/319
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/319/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/319
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/319/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/319
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/319/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/319
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/319/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tests/local-client/local-client_test.cpp'
--- tests/local-client/local-client_test.cpp 2016-08-18 09:25:51 +0000
+++ tests/local-client/local-client_test.cpp 2016-08-25 04:07:21 +0000
@@ -41,7 +41,9 @@
41using namespace unity::storage::qt::client;41using namespace unity::storage::qt::client;
42using namespace std;42using namespace std;
4343
44static constexpr int SIGNAL_WAIT_TIME = 1000;44// Yes, that's ridiculously long, but the builders in Jenkins and the CI Train
45// are stupifyingly slow at times.
46static constexpr int SIGNAL_WAIT_TIME = 30000;
4547
46// Bunch of helper functions to reduce the amount of noise in the tests.48// Bunch of helper functions to reduce the amount of noise in the tests.
4749
4850
=== modified file 'tests/remote-client/remote-client_test.cpp'
--- tests/remote-client/remote-client_test.cpp 2016-08-23 01:48:17 +0000
+++ tests/remote-client/remote-client_test.cpp 2016-08-25 04:07:21 +0000
@@ -40,6 +40,8 @@
40using namespace unity::storage::qt::client;40using namespace unity::storage::qt::client;
41using namespace std;41using namespace std;
4242
43// Yes, that's ridiculously long, but the builders in Jenkins and the CI Train
44// are stupifyingly slow at times.
43static constexpr int SIGNAL_WAIT_TIME = 30000;45static constexpr int SIGNAL_WAIT_TIME = 30000;
4446
45class RemoteClientTest : public ::testing::Test47class RemoteClientTest : public ::testing::Test

Subscribers

People subscribed via source and target branches

to all changes: