Merge lp:~andreas-pokorny/mir/attempt-to-reduce-nested-server-ci-testfailures into lp:mir
- attempt-to-reduce-nested-server-ci-testfailures
- Merge into development-branch
Status: | Merged |
---|---|
Approved by: | Cemil Azizoglu |
Approved revision: | no longer in the source branch. |
Merged at revision: | 3947 |
Proposed branch: | lp:~andreas-pokorny/mir/attempt-to-reduce-nested-server-ci-testfailures |
Merge into: | lp:mir |
Diff against target: |
111 lines (+29/-8) 1 file modified
tests/acceptance-tests/test_nested_mir.cpp (+29/-8) |
To merge this branch: | bzr merge lp:~andreas-pokorny/mir/attempt-to-reduce-nested-server-ci-testfailures |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mir CI Bot | continuous-integration | Approve | |
Cemil Azizoglu (community) | Approve | ||
Kevin DuBois (community) | Approve | ||
Review via email: mp+314367@code.launchpad.net |
Commit message
Avoid a tear down of the compositors caused by nested server reconfiguring the second display
This reduces the test cases running a display setup with two outputs to a handful of tests.
Description of the change
This should help with NestedServer.* failures.
Do not land yet. This is a test to see if it helps with the issues at all - it should help especially with the cursor configuration change tests...
Mir CI Bot (mir-ci-bot) wrote : | # |
Andreas Pokorny (andreas-pokorny) wrote : | # |
krillin demo client failure and this here:
<span class="
<span class="
<span class="
<span class="
<span class="
<span class="
<span class="
<span class="
<span class="
<span class="
<span class="
<span class="
<span class="
<span class="
<span class="
<span class="
<span class="
<span class="
<span class="
<span class="
<span class="
<span class="
<span class="
unrelated failure .. rerunning
Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:3916
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Andreas Pokorny (andreas-pokorny) wrote : | # |
[ FAILED ] RaiseSurfaces.
[ FAILED ] NestedInputWith
two different unrelated problems.
Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:3917
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:/
Click here to trigger a rebuild:
https:/
Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:3918
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Andreas Pokorny (andreas-pokorny) wrote : | # |
[ FAILED ] RaiseSurfaces.
and
[ FAILED ] NestedInput.
which are both not affected by the change in test_nested_
Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:3919
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: 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: Continuous integration, rev:3920
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:3921
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: 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:
https:/
Andreas Pokorny (andreas-pokorny) wrote : | # |
The last two ci runs only had three cases of [ FAILED ] RaiseSurfaces.
and clang ci killed due to inactivity
and TestClientLatency.*
Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:3922
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Kevin DuBois (kdub) wrote : | # |
Changes lgtm, hard to tell if this reduces failures though with the other failures happening.
Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:3923
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: 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:/
Andreas Pokorny (andreas-pokorny) wrote : | # |
^ failing CI run slept for three hours
Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:3924
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:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Andreas Pokorny (andreas-pokorny) wrote : | # |
^ killed after inactivity..
Cemil Azizoglu (cemil-azizoglu) wrote : | # |
ok once CI is happy
Daniel van Vugt (vanvugt) wrote : | # |
^^^
Bug 1655929
Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:3925
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:/
Click here to trigger a rebuild:
https:/
Preview Diff
1 | === modified file 'tests/acceptance-tests/test_nested_mir.cpp' |
2 | --- tests/acceptance-tests/test_nested_mir.cpp 2017-01-16 04:43:36 +0000 |
3 | +++ tests/acceptance-tests/test_nested_mir.cpp 2017-01-16 16:04:30 +0000 |
4 | @@ -139,6 +139,11 @@ |
5 | {{640, 0}, {1920, 1080}} |
6 | }; |
7 | |
8 | +std::vector<geom::Rectangle> const single_display_geometry |
9 | +{ |
10 | + {{ 0, 0}, { 640, 480}} |
11 | +}; |
12 | + |
13 | std::chrono::seconds const timeout{5}; |
14 | std::chrono::seconds const long_timeout{10}; |
15 | |
16 | @@ -487,8 +492,16 @@ |
17 | |
18 | std::shared_ptr<MockSessionMediatorReport> mock_session_mediator_report |
19 | {std::make_shared<NiceMock<MockSessionMediatorReport>>()}; |
20 | - NiceMock<MockDisplay> display{display_geometry}; |
21 | + std::vector<geom::Rectangle> display_rectangles; |
22 | + NiceMock<MockDisplay> display; |
23 | std::shared_ptr<StubSurfaceObserver> stub_observer = std::make_shared<StubSurfaceObserver>(); |
24 | + NestedServer() |
25 | + : display_rectangles{single_display_geometry}, display{display_rectangles} |
26 | + {} |
27 | + |
28 | + NestedServer(std::vector<geom::Rectangle> const& rectangles) |
29 | + : display_rectangles{rectangles}, display{display_rectangles} |
30 | + {} |
31 | |
32 | void SetUp() override |
33 | { |
34 | @@ -543,7 +556,7 @@ |
35 | |
36 | auto hw_display_config_for_unplug() -> std::shared_ptr<mtd::StubDisplayConfig> |
37 | { |
38 | - auto new_displays = display_geometry; |
39 | + auto new_displays = display_rectangles; |
40 | new_displays.resize(1); |
41 | |
42 | return std::make_shared<mtd::StubDisplayConfig>(new_displays); |
43 | @@ -552,7 +565,7 @@ |
44 | |
45 | auto hw_display_config_for_plugin() -> std::shared_ptr<mtd::StubDisplayConfig> |
46 | { |
47 | - auto new_displays = display_geometry; |
48 | + auto new_displays = display_rectangles; |
49 | new_displays.push_back({{2560, 0}, { 640, 480}}); |
50 | |
51 | return std::make_shared<mtd::StubDisplayConfig>(new_displays); |
52 | @@ -599,6 +612,14 @@ |
53 | } |
54 | }; |
55 | |
56 | +struct NestedServerWithTwoDisplays : NestedServer |
57 | +{ |
58 | + NestedServerWithTwoDisplays() |
59 | + : NestedServer{display_geometry} |
60 | + { |
61 | + } |
62 | +}; |
63 | + |
64 | struct Client |
65 | { |
66 | explicit Client(NestedMirRunner& nested_mir) : |
67 | @@ -724,7 +745,7 @@ |
68 | NestedMirRunner{new_connection()}; |
69 | } |
70 | |
71 | -TEST_F(NestedServer, sees_expected_outputs) |
72 | +TEST_F(NestedServerWithTwoDisplays, sees_expected_outputs) |
73 | { |
74 | NestedMirRunner nested_mir{new_connection()}; |
75 | |
76 | @@ -849,7 +870,7 @@ |
77 | EXPECT_TRUE(became_exposed_and_focused); |
78 | } |
79 | |
80 | -TEST_F(NestedServer, posts_when_scene_has_visible_changes) |
81 | +TEST_F(NestedServerWithTwoDisplays, posts_when_scene_has_visible_changes) |
82 | { |
83 | auto const number_of_nested_surfaces = 2; |
84 | auto const number_of_cursor_streams = number_of_nested_surfaces; |
85 | @@ -1171,7 +1192,7 @@ |
86 | } |
87 | |
88 | // lp:1511798 |
89 | -TEST_F(NestedServer, display_configuration_reset_when_application_exits) |
90 | +TEST_F(NestedServerWithTwoDisplays, display_configuration_reset_when_application_exits) |
91 | { |
92 | NestedMirRunner nested_mir{new_connection()}; |
93 | ignore_rebuild_of_egl_context(); |
94 | @@ -1456,7 +1477,7 @@ |
95 | Mock::VerifyAndClearExpectations(the_mock_display_configuration_report().get()); |
96 | } |
97 | |
98 | -TEST_F(NestedServer, |
99 | +TEST_F(NestedServerWithTwoDisplays, |
100 | given_client_set_display_configuration_when_monitor_unplugs_client_is_notified_of_new_display_configuration) |
101 | { |
102 | NestedMirRunner nested_mir{new_connection()}; |
103 | @@ -1532,7 +1553,7 @@ |
104 | Mock::VerifyAndClearExpectations(&display); |
105 | } |
106 | |
107 | -TEST_F(NestedServer, uses_passthrough_when_surface_size_is_appropriate) |
108 | +TEST_F(NestedServerWithTwoDisplays, uses_passthrough_when_surface_size_is_appropriate) |
109 | { |
110 | using namespace std::chrono_literals; |
111 | NestedMirRunner nested_mir{new_connection()}; |
FAILED: Continuous integration, rev:3915 /mir-jenkins. ubuntu. com/job/ mir-ci/ 2589/ /mir-jenkins. ubuntu. com/job/ build-mir/ 3371/console /mir-jenkins. ubuntu. com/job/ build-0- fetch/3438 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= vivid+overlay/ 3430 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= xenial+ overlay/ 3430 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= zesty/3430 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= zesty/3400 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= zesty/3400/ artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= xenial+ overlay/ 3400/console /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= zesty/3400 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= zesty/3400/ artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= android, release= vivid+overlay/ 3400/console /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= android, release= vivid+overlay/ 3400/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= android, release= vivid+overlay/ 3400 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= android, release= vivid+overlay/ 3400/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= mesa,release= xenial+ overlay/ 3400 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= mesa,release= xenial+ overlay/ 3400/artifact/ output/ *zip*/output. zip
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild: /mir-jenkins. ubuntu. com/job/ mir-ci/ 2589/rebuild
https:/