Merge lp://staging/~alan-griffiths/mir/tests-respect-logging-option into lp://staging/mir
Status: | Merged |
---|---|
Approved by: | Daniel van Vugt |
Approved revision: | no longer in the source branch. |
Merged at revision: | 2234 |
Proposed branch: | lp://staging/~alan-griffiths/mir/tests-respect-logging-option |
Merge into: | lp://staging/mir |
Diff against target: |
19 lines (+2/-0) 1 file modified
tests/mir_test_framework/server_runner.cpp (+2/-0) |
To merge this branch: | bzr merge lp://staging/~alan-griffiths/mir/tests-respect-logging-option |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Daniel van Vugt | Approve | ||
Kevin DuBois (community) | Approve | ||
Robert Carr (community) | Approve | ||
Cemil Azizoglu (community) | Approve | ||
Review via email:
|
Commit message
tests: fix logging option for some acceptance and integration tests
(LP: #1408231)
Description of the change
tests: fix logging option for some acceptance and integration tests
E.g. mir_acceptance_
Before:
[==========] Running 11 tests from 1 test case.
[----------] Global test environment set-up.
[----------] 11 tests from TestClientInput
[ RUN ] TestClientInput
[1421419535.839305] DisplayServer: Mir version 0.11.0
[ OK ] TestClientInput
[ RUN ] TestClientInput
[1421419535.855845] DisplayServer: Mir version 0.11.0
[ OK ] TestClientInput
[ RUN ] TestClientInput
[1421419535.868648] DisplayServer: Mir version 0.11.0
[ OK ] TestClientInput
[ RUN ] TestClientInput
[1421419535.903660] DisplayServer: Mir version 0.11.0
[ OK ] TestClientInput
[ RUN ] TestClientInput
[1421419535.916956] DisplayServer: Mir version 0.11.0
[ OK ] TestClientInput
[ RUN ] TestClientInput
[1421419535.939237] DisplayServer: Mir version 0.11.0
[ OK ] TestClientInput
[ RUN ] TestClientInput
[1421419535.954657] DisplayServer: Mir version 0.11.0
[ OK ] TestClientInput
[ RUN ] TestClientInput
[1421419535.970966] DisplayServer: Mir version 0.11.0
[ OK ] TestClientInput
[ RUN ] TestClientInput
[1421419536.013526] DisplayServer: Mir version 0.11.0
[ OK ] TestClientInput
[ RUN ] TestClientInput
[1421419536.050815] DisplayServer: Mir version 0.11.0
[ OK ] TestClientInput
[ RUN ] TestClientInput
[1421419536.087551] DisplayServer: Mir version 0.11.0
[ OK ] TestClientInput
[----------] 11 tests from TestClientInput (260 ms total)
[----------] Global test environment tear-down
[==========] 11 tests from 1 test case ran. (260 ms total)
[ PASSED ] 11 tests.
After:
[==========] Running 11 tests from 1 test case.
[----------] Global test environment set-up.
[----------] 11 tests from TestClientInput
[ RUN ] TestClientInput
[ OK ] TestClientInput
[ RUN ] TestClientInput
[ OK ] TestClientInput
[ RUN ] TestClientInput
[ OK ] TestClientInput
[ RUN ] TestClientInput
[ OK ] TestClientInput
[ RUN ] TestClientInput
[ OK ] TestClientInput
[ RUN ] TestClientInput
[ OK ] TestClientInput
[ RUN ] TestClientInput
[ OK ] TestClientInput
[ RUN ] TestClientInput
[ OK ] TestClientInput
[ RUN ] TestClientInput
[ OK ] TestClientInput
[ RUN ] TestClientInput
[ OK ] TestClientInput
[ RUN ] TestClientInput
[ OK ] TestClientInput
[----------] 11 tests from TestClientInput (282 ms total)
[----------] Global test environment tear-down
[==========] 11 tests from 1 test case ran. (282 ms total)
[ PASSED ] 11 tests.
(As with other tests adding "--logging on" enables logging)
Ok.