QtMir

Merge lp:~saviq/qtmir/tests-more-time into lp:qtmir

  1. tests-more-time
  2. Merge into trunk
Proposed by Michał Sawicz
Status: Rejected
Rejected by: Michał Sawicz
Proposed branch: lp:~saviq/qtmir/tests-more-time
Merge into: lp:qtmir
Diff against target: 119 lines (+14/-14)
1 file modified
tests/modules/SharedWakelock/sharedwakelock_test.cpp (+14/-14)
To merge this branch: bzr merge lp:~saviq/qtmir/tests-more-time
Reviewer Review Type Date Requested Status
Unity8 CI Bot (community) continuous-integration Needs Fixing
Michał Sawicz Disapprove
Review via email: mp+305316@code.launchpad.net

Commit message

Give the SharedWakelock test more time

On a congested host on CI, the default 5s timeout wasn't enough.

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:559
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/378/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2816/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2844
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2703
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2703/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2703
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2703/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2703
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2703/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2703
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2703/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2703
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2703/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2703
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2703/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2703/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2703
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2703/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2703
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2703/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/378/rebuild

review: Needs Fixing (continuous-integration)
lp:~saviq/qtmir/tests-more-time updated
559. By Michał Sawicz

Give the SharedWakelock test more time

On a congested host on CI, the default 5s timeout wasn't enough.

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:559
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/379/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2822
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2850
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2708
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2708/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2708
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2708/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2708
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2708/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2708
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2708/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2708
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2708/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2708
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2708/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2708
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2708/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2708
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2708/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2708
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2708/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/379/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

OK no this isn't helping.

review: Disapprove
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:559
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/380/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2826/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2854
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2712
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2712/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2712
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2712/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2712
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2712/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2712
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2712/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2712
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2712/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2712
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2712/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2712/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2712
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2712/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2712
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2712/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/380/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

559. By Michał Sawicz

Give the SharedWakelock test more time

On a congested host on CI, the default 5s timeout wasn't enough.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/modules/SharedWakelock/sharedwakelock_test.cpp'
2--- tests/modules/SharedWakelock/sharedwakelock_test.cpp 2015-08-11 12:08:32 +0000
3+++ tests/modules/SharedWakelock/sharedwakelock_test.cpp 2016-09-09 12:21:08 +0000
4@@ -97,14 +97,14 @@
5
6 QScopedPointer<QObject> object(new QObject);
7 wakelock.acquire(object.data());
8- wakelockDBusMethodSpy.wait();
9+ wakelockDBusMethodSpy.wait(30000);
10
11 EXPECT_FALSE(wakelockDBusMethodSpy.empty());
12 EXPECT_CALL(wakelockDBusMethodSpy, 0, "requestSysState",
13 QVariantList() << QString("active") << 1);
14
15 // Ensure a wakelock created
16- wakelockEnabledSpy.wait();
17+ wakelockEnabledSpy.wait(30000);
18 EXPECT_FALSE(wakelockEnabledSpy.empty());
19 EXPECT_TRUE(wakelock.enabled());
20 }
21@@ -120,12 +120,12 @@
22
23 QScopedPointer<QObject> object(new QObject);
24 wakelock.acquire(object.data());
25- wakelockEnabledSpy.wait();
26+ wakelockEnabledSpy.wait(30000);
27
28 // Verify the DBus method is called
29 QSignalSpy wakelockDBusMethodSpy(&powerdMockInterface(), SIGNAL(MethodCalled(const QString &, const QVariantList &)));
30 wakelock.release(object.data());
31- wakelockDBusMethodSpy.wait();
32+ wakelockDBusMethodSpy.wait(30000);
33
34 EXPECT_FALSE(wakelockDBusMethodSpy.empty());
35 EXPECT_CALL(wakelockDBusMethodSpy, 0, "clearSysState",
36@@ -146,7 +146,7 @@
37 QScopedPointer<QObject> object(new QObject);
38 wakelock.acquire(object.data());
39 wakelock.acquire(object.data());
40- wakelockDBusMethodSpy.wait();
41+ wakelockDBusMethodSpy.wait(30000);
42
43 EXPECT_EQ(wakelockDBusMethodSpy.count(), 1);
44 }
45@@ -164,7 +164,7 @@
46 wakelock.acquire(object.data());
47 wakelock.acquire(object.data());
48 wakelock.release(object.data());
49- wakelockEnabledSpy.wait();
50+ wakelockEnabledSpy.wait(30000);
51 EXPECT_FALSE(wakelock.enabled());
52 }
53
54@@ -182,7 +182,7 @@
55 wakelock.acquire(object1.data());
56 wakelock.acquire(object2.data());
57
58- wakelockDBusMethodSpy.wait();
59+ wakelockDBusMethodSpy.wait(30000);
60 EXPECT_EQ(wakelockDBusMethodSpy.count(), 1);
61 }
62
63@@ -202,7 +202,7 @@
64 wakelock.release(object1.data());
65 wakelock.release(object2.data());
66
67- wakelockEnabledSpy.wait();
68+ wakelockEnabledSpy.wait(30000);
69 EXPECT_FALSE(wakelock.enabled());
70 }
71
72@@ -220,7 +220,7 @@
73 wakelock.acquire(object2.data());
74 wakelock.release(object1.data());
75
76- wakelockEnabledSpy.wait();
77+ wakelockEnabledSpy.wait(30000);
78
79 wakelock.release(object1.data());
80
81@@ -267,7 +267,7 @@
82 wakelock.release(object.data());
83 wakelock.acquire(object.data());
84
85- while (wakelockDBusMethodSpy.wait()) {}
86+ while (wakelockDBusMethodSpy.wait(30000)) {}
87 EXPECT_TRUE(wakelock.enabled());
88
89 // there must be at least one clearSysState call, but is not necessarily the second call
90@@ -321,13 +321,13 @@
91
92 QScopedPointer<QObject> object(new QObject);
93 wakelock.acquire(object.data());
94- wakelockEnabledSpy.wait();
95+ wakelockEnabledSpy.wait(30000);
96
97 // Verify the DBus method is called
98 QSignalSpy wakelockDBusMethodSpy(&powerdMockInterface(), SIGNAL(MethodCalled(const QString &, const QVariantList &)));
99
100 object.reset();
101- wakelockDBusMethodSpy.wait();
102+ wakelockDBusMethodSpy.wait(30000);
103
104 EXPECT_FALSE(wakelockDBusMethodSpy.empty());
105 EXPECT_CALL(wakelockDBusMethodSpy, 0, "clearSysState",
106@@ -368,11 +368,11 @@
107
108 QScopedPointer<QObject> object(new QObject);
109 wakelock->acquire(object.data());
110- wakelockEnabledSpy.wait(); // wait for wakelock to be enabled
111+ wakelockEnabledSpy.wait(30000); // wait for wakelock to be enabled
112
113 QSignalSpy wakelockDBusMethodSpy(&powerdMockInterface(), SIGNAL(MethodCalled(const QString &, const QVariantList &)));
114 delete wakelock;
115- wakelockDBusMethodSpy.wait();
116+ wakelockDBusMethodSpy.wait(30000);
117
118 EXPECT_FALSE(wakelockDBusMethodSpy.empty());
119 EXPECT_CALL(wakelockDBusMethodSpy, 0, "clearSysState",

Subscribers

People subscribed via source and target branches