Merge lp:~alan-griffiths/mir/fix-1709666 into lp:mir
- fix-1709666
- Merge into development-branch
Status: | Merged |
---|---|
Merged at revision: | 4224 |
Proposed branch: | lp:~alan-griffiths/mir/fix-1709666 |
Merge into: | lp:mir |
Diff against target: |
55 lines (+11/-7) 2 files modified
tests/acceptance-tests/test_nested_mir.cpp (+10/-6) tests/mir_test_framework/server_runner.cpp (+1/-1) |
To merge this branch: | bzr merge lp:~alan-griffiths/mir/fix-1709666 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mir CI Bot | continuous-integration | Needs Fixing | |
Chris Halse Rogers | Approve | ||
Review via email: mp+328835@code.launchpad.net |
Commit message
Look for the last of a series of synthetic events to ensure that the queue is drained before the test exits. (LP: #1709666)
Description of the change
Mir CI Bot (mir-ci-bot) wrote : | # |
Alan Griffiths (alan-griffiths) wrote : | # |
Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:4222
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Alan Griffiths (alan-griffiths) wrote : | # |
Eugh!
14:47:20 15: [ RUN ] FocusSelection.
14:47:22 15: [2017-08-10 14:47:22.572677] mirplatform: Found graphics driver: mir:mesa-x11 (version 1.0.0)
...
14:47:39 15: [2017-08-10 14:47:39.489932] mirserver: . |_ Scaling factor: 1.00
14:47:41 15: ==12654== Thread 2:
14:47:41 15: ==12654== Conditional jump or move depends on uninitialised value(s)
14:47:41 15: ==12654== at 0x471C837: pthread_mutex_lock (pthread_
14:47:41 15: ==12654== by 0x8D7E886: __gthread_
14:47:41 15: ==12654== by 0x8D81B9F: std::mutex::lock() (mutex:135)
14:47:41 15: ==12654== by 0x8E556C0: std::lock_
14:47:41 15: ==12654== by 0x92BD6F6: mir_test_
OK, so "started_
Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:4224
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
https:/
Executed test runs:
SUCCESS: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Alan Griffiths (alan-griffiths) wrote : | # |
Another "failed" merge that landed. :(
Preview Diff
1 | === modified file 'tests/acceptance-tests/test_nested_mir.cpp' | |||
2 | --- tests/acceptance-tests/test_nested_mir.cpp 2017-07-28 17:00:43 +0000 | |||
3 | +++ tests/acceptance-tests/test_nested_mir.cpp 2017-08-10 16:05:32 +0000 | |||
4 | @@ -289,13 +289,15 @@ | |||
5 | 289 | [this] | 289 | [this] |
6 | 290 | { | 290 | { |
7 | 291 | if (surface_ready) return true; | 291 | if (surface_ready) return true; |
12 | 292 | fake_input_device->emit_event( | 292 | ++probe_scancode; |
13 | 293 | mi::synthesis::a_key_down_event().of_scancode(KEY_A)); | 293 | fake_input_device->emit_event( |
14 | 294 | fake_input_device->emit_event( | 294 | mi::synthesis::a_key_down_event().of_scancode(probe_scancode)); |
15 | 295 | mi::synthesis::a_key_up_event().of_scancode(KEY_A)); | 295 | fake_input_device->emit_event( |
16 | 296 | mi::synthesis::a_key_up_event().of_scancode(probe_scancode)); | ||
17 | 296 | return false; | 297 | return false; |
18 | 297 | }, | 298 | }, |
20 | 298 | std::chrono::seconds{5}); | 299 | std::chrono::seconds{5}, |
21 | 300 | std::chrono::seconds{1}); | ||
22 | 299 | 301 | ||
23 | 300 | EXPECT_TRUE(dummy_events_received); | 302 | EXPECT_TRUE(dummy_events_received); |
24 | 301 | 303 | ||
25 | @@ -329,7 +331,8 @@ | |||
26 | 329 | if (mir_input_event_get_type(iev) == mir_input_event_type_key) | 331 | if (mir_input_event_get_type(iev) == mir_input_event_type_key) |
27 | 330 | { | 332 | { |
28 | 331 | auto const kev = mir_input_event_get_keyboard_event(iev); | 333 | auto const kev = mir_input_event_get_keyboard_event(iev); |
30 | 332 | if (mir_keyboard_event_scan_code(kev) == KEY_A) | 334 | if (mir_keyboard_event_scan_code(kev) == nmr->probe_scancode && |
31 | 335 | mir_keyboard_event_action(kev) ==mir_keyboard_action_up) | ||
32 | 333 | nmr->surface_ready = true; | 336 | nmr->surface_ready = true; |
33 | 334 | } | 337 | } |
34 | 335 | } | 338 | } |
35 | @@ -341,6 +344,7 @@ | |||
36 | 341 | "test-devce", "test-device", | 344 | "test-devce", "test-device", |
37 | 342 | mi::DeviceCapability::pointer | mi::DeviceCapability::keyboard | mi::DeviceCapability::alpha_numeric})}; | 345 | mi::DeviceCapability::pointer | mi::DeviceCapability::keyboard | mi::DeviceCapability::alpha_numeric})}; |
38 | 343 | std::atomic<bool> surface_ready{false}; | 346 | std::atomic<bool> surface_ready{false}; |
39 | 347 | std::atomic<int> probe_scancode{KEY_A}; | ||
40 | 344 | }; | 348 | }; |
41 | 345 | 349 | ||
42 | 346 | struct NestedServer : mtf::HeadlessInProcessServer | 350 | struct NestedServer : mtf::HeadlessInProcessServer |
43 | 347 | 351 | ||
44 | === modified file 'tests/mir_test_framework/server_runner.cpp' | |||
45 | --- tests/mir_test_framework/server_runner.cpp 2017-07-28 17:00:43 +0000 | |||
46 | +++ tests/mir_test_framework/server_runner.cpp 2017-08-10 16:05:32 +0000 | |||
47 | @@ -127,7 +127,7 @@ | |||
48 | 127 | }); | 127 | }); |
49 | 128 | 128 | ||
50 | 129 | std::unique_lock<std::mutex> lock(mutex); | 129 | std::unique_lock<std::mutex> lock(mutex); |
52 | 130 | started_cv.wait_for(lock, std::chrono::seconds{10}, [&]{ return started; }); | 130 | started_cv.wait_for(lock, std::chrono::seconds{30}, [&]{ return started; }); |
53 | 131 | 131 | ||
54 | 132 | return ml; | 132 | return ml; |
55 | 133 | } | 133 | } |
FAILED: Continuous integration, rev:4222 /mir-jenkins. ubuntu. com/job/ mir-ci/ 3547/ /mir-jenkins. ubuntu. com/job/ build-mir/ 4855/console /mir-jenkins. ubuntu. com/job/ build-0- fetch/5056 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= artful/ 5045 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= xenial/ 5045 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= zesty/5045 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= artful/ 4892 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= artful/ 4892/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= zesty/4892 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= zesty/4892/ artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= artful/ 4892 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= artful/ 4892/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= xenial/ 4892 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= xenial/ 4892/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= zesty/4892/ console /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= mesa,release= artful/ 4892 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= mesa,release= artful/ 4892/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= mesa,release= zesty/4892 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= mesa,release= zesty/4892/ artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= mesa,release= xenial/ 4892 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= mesa,release= xenial/ 4892/artifact/ output/ *zip*/output. zip
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild: /mir-jenkins. ubuntu. com/job/ mir-ci/ 3547/rebuild
https:/