Mir

Merge lp://staging/~alan-griffiths/mir/tests-respect-logging-option into lp://staging/mir

Proposed by Alan Griffiths
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
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: mp+246717@code.staging.launchpad.net

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_tests --gtest_filter=TestClientInput.*

Before:

[==========] Running 11 tests from 1 test case.
[----------] Global test environment set-up.
[----------] 11 tests from TestClientInput
[ RUN ] TestClientInput.clients_receive_key_input
[1421419535.839305] DisplayServer: Mir version 0.11.0
[ OK ] TestClientInput.clients_receive_key_input (16 ms)
[ RUN ] TestClientInput.clients_receive_us_english_mapped_keys
[1421419535.855845] DisplayServer: Mir version 0.11.0
[ OK ] TestClientInput.clients_receive_us_english_mapped_keys (13 ms)
[ RUN ] TestClientInput.clients_receive_pointer_inside_window
[1421419535.868648] DisplayServer: Mir version 0.11.0
[ OK ] TestClientInput.clients_receive_pointer_inside_window (35 ms)
[ RUN ] TestClientInput.clients_receive_button_events_inside_window
[1421419535.903660] DisplayServer: Mir version 0.11.0
[ OK ] TestClientInput.clients_receive_button_events_inside_window (13 ms)
[ RUN ] TestClientInput.multiple_clients_receive_pointer_inside_windows
[1421419535.916956] DisplayServer: Mir version 0.11.0
[ OK ] TestClientInput.multiple_clients_receive_pointer_inside_windows (23 ms)
[ RUN ] TestClientInput.clients_do_not_receive_pointer_outside_input_region
[1421419535.939237] DisplayServer: Mir version 0.11.0
[ OK ] TestClientInput.clients_do_not_receive_pointer_outside_input_region (13 ms)
[ RUN ] TestClientInput.scene_obscure_motion_events_by_stacking
[1421419535.954657] DisplayServer: Mir version 0.11.0
[ OK ] TestClientInput.scene_obscure_motion_events_by_stacking (18 ms)
[ RUN ] TestClientInput.hidden_clients_do_not_receive_pointer_events
[1421419535.970966] DisplayServer: Mir version 0.11.0
[ OK ] TestClientInput.hidden_clients_do_not_receive_pointer_events (41 ms)
[ RUN ] TestClientInput.clients_receive_pointer_within_coordinate_system_of_window
[1421419536.013526] DisplayServer: Mir version 0.11.0
[ OK ] TestClientInput.clients_receive_pointer_within_coordinate_system_of_window (38 ms)
[ RUN ] TestClientInput.usb_direct_input_devices_work
[1421419536.050815] DisplayServer: Mir version 0.11.0
[ OK ] TestClientInput.usb_direct_input_devices_work (37 ms)
[ RUN ] TestClientInput.send_mir_input_events_through_surface
[1421419536.087551] DisplayServer: Mir version 0.11.0
[ OK ] TestClientInput.send_mir_input_events_through_surface (12 ms)
[----------] 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.clients_receive_key_input
[ OK ] TestClientInput.clients_receive_key_input (18 ms)
[ RUN ] TestClientInput.clients_receive_us_english_mapped_keys
[ OK ] TestClientInput.clients_receive_us_english_mapped_keys (13 ms)
[ RUN ] TestClientInput.clients_receive_pointer_inside_window
[ OK ] TestClientInput.clients_receive_pointer_inside_window (35 ms)
[ RUN ] TestClientInput.clients_receive_button_events_inside_window
[ OK ] TestClientInput.clients_receive_button_events_inside_window (13 ms)
[ RUN ] TestClientInput.multiple_clients_receive_pointer_inside_windows
[ OK ] TestClientInput.multiple_clients_receive_pointer_inside_windows (42 ms)
[ RUN ] TestClientInput.clients_do_not_receive_pointer_outside_input_region
[ OK ] TestClientInput.clients_do_not_receive_pointer_outside_input_region (14 ms)
[ RUN ] TestClientInput.scene_obscure_motion_events_by_stacking
[ OK ] TestClientInput.scene_obscure_motion_events_by_stacking (18 ms)
[ RUN ] TestClientInput.hidden_clients_do_not_receive_pointer_events
[ OK ] TestClientInput.hidden_clients_do_not_receive_pointer_events (40 ms)
[ RUN ] TestClientInput.clients_receive_pointer_within_coordinate_system_of_window
[ OK ] TestClientInput.clients_receive_pointer_within_coordinate_system_of_window (36 ms)
[ RUN ] TestClientInput.usb_direct_input_devices_work
[ OK ] TestClientInput.usb_direct_input_devices_work (39 ms)
[ RUN ] TestClientInput.send_mir_input_events_through_surface
[ OK ] TestClientInput.send_mir_input_events_through_surface (13 ms)
[----------] 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)

To post a comment you must log in.
Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

Ok.

review: Approve
Revision history for this message
Robert Carr (robertcarr) wrote :

Thanks

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Kevin DuBois (kdub) wrote :

lgtm

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

Linked to bug 1408231.

Revision history for this message
Daniel van Vugt (vanvugt) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches