1
=== modified file 'tests/acceptance-tests/test_client_logging.cpp'
2
--- tests/acceptance-tests/test_client_logging.cpp	2016-05-18 09:16:16 +0000
3
+++ tests/acceptance-tests/test_client_logging.cpp	2016-05-24 08:19:27 +0000
4
@@ -107,13 +107,22 @@
5
107
            EXPECT_STREQ("Rumpelstiltskin", name);
107
            EXPECT_STREQ("Rumpelstiltskin", name);
6
108
            EXPECT_THAT(render, Gt(target_render_time.count() - 1));
108
            EXPECT_THAT(render, Gt(target_render_time.count() - 1));
7
109
109
15
110
            // Not a great test, but it will catch LP: #1581368 while
110
            // On a regular machine, render will be 3 (milliseconds) matching
16
111
            // also dealing with the possibility that CI machines
111
            // the above render loop. CI however is super-slow at times so
17
112
            // are super slow:
112
            // we just check rendering completed in under one second.
18
113
            auto expected_frame_time = 1000.0f / target_fps;
113
            // That's still easily enough to regression-test LP: #1581368
19
114
            EXPECT_THAT(render, Lt(expected_frame_time));
114
            // where it had values in the millions.
20
115
            EXPECT_THAT(lag, Gt(expected_frame_time/2));
115
            EXPECT_THAT(render, Lt(1000));
21
116
            EXPECT_THAT(nbuffers, Eq(3));
116
22
117
            EXPECT_THAT(lag, Gt(0.0f));
23
118
24
119
            // In order to see all three buffers the client must be rendering
25
120
            // at least in bursts faster than the compositor consumes them.
26
121
            // On the surface of it the above render loop should appear to
27
122
            // do that, but in reality we're feeding an unthottled fake
28
123
            // compositor here so may never hit all three buffers...
29
124
            EXPECT_THAT(nbuffers, Ge(2));
30
125
31
117
            ASSERT_FALSE(Test::HasFailure()) << "Log line = {" << line << "}";
126
            ASSERT_FALSE(Test::HasFailure()) << "Log line = {" << line << "}";
32
118
        }
127
        }
33
119
    }
128
    }
Reviewer	Review Type	Date Requested	Status
Cemil Azizoglu (community)			Approve on 2016-05-24
Andreas Pokorny (community)		2016-05-23	Approve on 2016-05-24
Mir CI Bot	continuous-integration		Approve on 2016-05-24
Review via email: mp+295419@code.launchpad.net