Mir

Merge lp:~alan-griffiths/mir/fix-1212518 into lp:~mir-team/mir/trunk

  1. fix-1212518
  2. Merge into trunk
Proposed by Alan Griffiths
Status: Merged
Approved by: Daniel van Vugt
Approved revision: no longer in the source branch.
Merged at revision: 979
Proposed branch: lp:~alan-griffiths/mir/fix-1212518
Merge into: lp:~mir-team/mir/trunk
Diff against target: 11 lines (+1/-1)
1 file modified
tests/acceptance-tests/test_client_input.cpp (+1/-1)
To merge this branch: bzr merge lp:~alan-griffiths/mir/fix-1212518
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
Alexandros Frantzis (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+180313@code.launchpad.net

Commit message

tests: Workaround for test timeout under valgrind

Description of the change

tests: Workaround for test timeout under valgrind

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

PASSED: Continuous integration, rev:977
http://jenkins.qa.ubuntu.com/job/mir-ci/1314/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1751
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1636
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/552
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/552/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/1314/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

Looks good, but...

The uses of the cross process fences I have seen don't really have strict timing requirements. The timeout is used only to expedite an exit in case of a perceived hang. Perhaps a larger value, e.g. 15 seconds, would be a better compromise as the default timeout for wait_for_signal_ready_for().

review: Approve
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Seems to work. Also, it looks like racarr is aiming to fix similar spurious failures in lp:~robertcarr/mir/client-focus-notifications.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/acceptance-tests/test_client_input.cpp'
2--- tests/acceptance-tests/test_client_input.cpp 2013-08-14 03:18:30 +0000
3+++ tests/acceptance-tests/test_client_input.cpp 2013-08-15 10:30:18 +0000
4@@ -919,7 +919,7 @@
5 void exec()
6 {
7 // Ensure we stack on top of the first client
8- input_cb_setup_fence.wait_for_signal_ready_for();
9+ input_cb_setup_fence.wait_for_signal_ready_for(std::chrono::milliseconds(4000));
10 InputClient::exec();
11 }
12

Subscribers

People subscribed via source and target branches