Merge lp://staging/~morphis/aethercast/fix-integraion-tests into lp://staging/aethercast
Proposed by
Simon Fels
Status: | Merged |
---|---|
Approved by: | Simon Fels |
Approved revision: | 152 |
Merged at revision: | 149 |
Proposed branch: | lp://staging/~morphis/aethercast/fix-integraion-tests |
Merge into: | lp://staging/aethercast |
Diff against target: |
52 lines (+11/-2) 1 file modified
tests/ac/integration_tests/test_stream_performance.cpp (+11/-2) |
To merge this branch: | bzr merge lp://staging/~morphis/aethercast/fix-integraion-tests |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Matteo Croce (community) | Approve | ||
Konrad Zapałowicz (community) | code | Approve | |
Review via email: mp+298400@code.staging.launchpad.net |
Commit message
Fix integration tests
There were several problems with the integration tests so that they couldn't run at all. This fixes the different problems:
* don't acquire display lock twice
* allow user to specify a different reference result file per environment variable
* run glib mainloop for a second on startup to respect deferred pipeline startup
To post a comment you must log in.
LGTM except on the missing comment line.