Merge lp://qastaging/~compiz-team/compiz/compiz.fix_1169170 into lp://qastaging/compiz/0.9.10
Proposed by
Sam Spilsbury
| Status: | Merged |
|---|---|
| Approved by: | Sam Spilsbury |
| Approved revision: | 3657 |
| Merged at revision: | 3658 |
| Proposed branch: | lp://qastaging/~compiz-team/compiz/compiz.fix_1169170 |
| Merge into: | lp://qastaging/compiz/0.9.10 |
| Diff against target: |
12 lines (+1/-1) 1 file modified
tests/xorg-gtest/src/compiz-xorg-gtest.cpp (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~compiz-team/compiz/compiz.fix_1169170 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| MC Return | Approve | ||
| PS Jenkins bot (community) | continuous-integration | Approve | |
| Compiz Maintainers | Pending | ||
|
Review via email:
|
|||
Commit message
Don't timeout after 3000ms when asking compiz for a startup message.
It can sometimes take longer in the valgrind case. Also timeouts are
bad design for tests.
(LP: #1169170)
Description of the change
Don't timeout after 3000ms when asking compiz for a startup message.
It can sometimes take longer in the valgrind case. Also timeouts are
bad design for tests.
(LP: #1169170)
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
PASSED: Continuous integration, rev:3657
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://