Mir

Merge lp:~vanvugt/mir/fix-1277343 into lp:mir

Proposed by Daniel van Vugt
Status: Merged
Approved by: Alan Griffiths
Approved revision: no longer in the source branch.
Merged at revision: 1405
Proposed branch: lp:~vanvugt/mir/fix-1277343
Merge into: lp:mir
Diff against target: 40 lines (+9/-0)
2 files modified
src/client/mir_connection.cpp (+1/-0)
tests/unit-tests/client/test_mir_connection.cpp (+8/-0)
To merge this branch: bzr merge lp:~vanvugt/mir/fix-1277343
Reviewer Review Type Date Requested Status
Alan Griffiths Approve
Alexandros Frantzis (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Daniel van Vugt Abstain
Review via email: mp+206671@code.launchpad.net

Commit message

Remember to set field "current_format" when sending a display config to the
server. Until now it had been left uninitialized, which resulted in an
invalid display config on the server (LP: #1277343)

A test case did exist for this kind of thing, but the test case itself was
buggy and never updated to check the relatively new field "current_format".

To post a comment you must log in.
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Mixed up current_mode/format in test case.

review: Needs Fixing
Revision history for this message
Daniel van Vugt (vanvugt) :
review: Abstain
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

Looks good.

review: Approve
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/client/mir_connection.cpp'
2--- src/client/mir_connection.cpp 2014-01-31 03:46:36 +0000
3+++ src/client/mir_connection.cpp 2014-02-17 09:33:41 +0000
4@@ -458,6 +458,7 @@
5 display_request->set_output_id(output.output_id);
6 display_request->set_used(output.used);
7 display_request->set_current_mode(output.current_mode);
8+ display_request->set_current_format(output.current_format);
9 display_request->set_position_x(output.position_x);
10 display_request->set_position_y(output.position_y);
11 display_request->set_power_mode(output.power_mode);
12
13=== modified file 'tests/unit-tests/client/test_mir_connection.cpp'
14--- tests/unit-tests/client/test_mir_connection.cpp 2014-01-14 04:10:15 +0000
15+++ tests/unit-tests/client/test_mir_connection.cpp 2014-02-17 09:33:41 +0000
16@@ -455,6 +455,7 @@
17 MirDisplayOutput output;
18 output.output_id = 0;
19 output.current_mode = 0;
20+ output.current_format = mir_pixel_format_xbgr_8888;
21 output.used = 0;
22 output.position_x = 4;
23 output.position_y = 6;
24@@ -466,10 +467,17 @@
25 ASSERT_NE(nullptr, config);
26 ASSERT_EQ(1, config->display_output_size());
27 auto const& disp1 = config->display_output(0);
28+ EXPECT_TRUE(disp1.has_output_id());
29 EXPECT_EQ(output.output_id, disp1.output_id());
30+ EXPECT_TRUE(disp1.has_used());
31 EXPECT_EQ(output.used, disp1.used());
32+ EXPECT_TRUE(disp1.has_current_mode());
33 EXPECT_EQ(output.current_mode, disp1.current_mode());
34+ EXPECT_TRUE(disp1.has_current_format());
35+ EXPECT_EQ(output.current_format, disp1.current_format());
36+ EXPECT_TRUE(disp1.has_position_x());
37 EXPECT_EQ(output.position_x, disp1.position_x());
38+ EXPECT_TRUE(disp1.has_position_y());
39 EXPECT_EQ(output.position_y, disp1.position_y());
40 };
41

Subscribers

People subscribed via source and target branches