1
=== modified file 'tests/acceptance-tests/test_server_startup.cpp'
2
--- tests/acceptance-tests/test_server_startup.cpp	2015-02-22 07:46:25 +0000
3
+++ tests/acceptance-tests/test_server_startup.cpp	2016-02-26 03:39:01 +0000
4
@@ -18,11 +18,13 @@
5
18
 */
18
 */
6
19
19
7
20
#include "mir_test_framework/interprocess_client_server_test.h"
20
#include "mir_test_framework/interprocess_client_server_test.h"
8
21
#include "mir_test_framework/headless_in_process_server.h"
9
21
#include "mir_test_framework/detect_server.h"
22
#include "mir_test_framework/detect_server.h"
10
22
23
11
23
#include <chrono>
24
#include <chrono>
12
24
#include <gmock/gmock.h>
25
#include <gmock/gmock.h>
13
25
#include <gtest/gtest.h>
26
#include <gtest/gtest.h>
14
27
#include <fcntl.h>
15
26
28
16
27
namespace mf = mir::frontend;
29
namespace mf = mir::frontend;
17
28
namespace mc = mir::compositor;
30
namespace mc = mir::compositor;
18
@@ -65,3 +67,30 @@
19
65
                                           std::chrono::milliseconds(100)));
67
                                           std::chrono::milliseconds(100)));
20
66
        });
68
        });
21
67
}
69
}
22
70
23
71
TEST(ServerStartupReliability, DISABLED_can_start_with_low_entropy)
24
72
{   // Regression test for LP: #1536662 and LP: #1541188
25
73
    using namespace ::testing;
26
74
27
75
    // Flush the entropy pool
28
76
    int fd = open("/dev/random", O_RDONLY | O_NONBLOCK);
29
77
    ASSERT_THAT(fd, Ge(0));
30
78
    char buf[256];
31
79
    while (read(fd, buf, sizeof buf) > 0) {}
32
80
    close(fd);
33
81
34
82
    auto start = std::chrono::high_resolution_clock::now();
35
83
36
84
    struct Server : mtf::HeadlessInProcessServer
37
85
    {
38
86
        void TestBody() override {}
39
87
    } server;
40
88
41
89
    EXPECT_NO_THROW(server.SetUp(););
42
90
43
91
    auto duration = std::chrono::high_resolution_clock::now() - start;
44
92
    int seconds = std::chrono::duration_cast<std::chrono::seconds>(duration).count();
45
93
    EXPECT_THAT(seconds, Lt(15));
46
94
47
95
    server.TearDown();
48
96
}
49
68
97
50
=== modified file 'tests/unit-tests/test_mir_cookie.cpp'
51
--- tests/unit-tests/test_mir_cookie.cpp	2016-01-29 08:18:22 +0000
52
+++ tests/unit-tests/test_mir_cookie.cpp	2016-02-26 03:39:01 +0000
53
@@ -22,6 +22,9 @@
54
22
#include <gtest/gtest.h>
22
#include <gtest/gtest.h>
55
23
#include <gmock/gmock.h>
23
#include <gmock/gmock.h>
56
24
24
57
25
#include <chrono>
58
26
#include <fcntl.h>
59
27
60
25
TEST(MirCookieAuthority, attests_real_timestamp)
28
TEST(MirCookieAuthority, attests_real_timestamp)
61
26
{
29
{
62
27
    std::vector<uint8_t> secret{ 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0xde, 0x01 };
30
    std::vector<uint8_t> secret{ 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0xde, 0x01 };
63
@@ -115,3 +118,23 @@
64
115
    EXPECT_THAT(mir::cookie::Authority::optimal_secret_size(),
118
    EXPECT_THAT(mir::cookie::Authority::optimal_secret_size(),
65
116
        Ge(mir::cookie::Authority::minimum_secret_size));
119
        Ge(mir::cookie::Authority::minimum_secret_size));
66
117
}
120
}
67
121
68
122
TEST(MirCookieAuthority, DISABLED_given_low_entropy_does_not_hang_or_crash)
69
123
{   // Regression test for LP: #1536662 and LP: #1541188
70
124
    using namespace testing;
71
125
72
126
    // Flush the entropy pool
73
127
    int fd = open("/dev/random", O_RDONLY | O_NONBLOCK);
74
128
    ASSERT_THAT(fd, Ge(0));
75
129
    char buf[256];
76
130
    while (read(fd, buf, sizeof buf) > 0) {}
77
131
    close(fd);
78
132
79
133
    auto start = std::chrono::high_resolution_clock::now();
80
134
81
135
    EXPECT_NO_THROW( mir::cookie::Authority::create() );
82
136
83
137
    auto duration = std::chrono::high_resolution_clock::now() - start;
84
138
    int seconds = std::chrono::duration_cast<std::chrono::seconds>(duration).count();
85
139
    EXPECT_THAT(seconds, Lt(15));
86
140
}
Reviewer	Review Type	Date Requested	Status
Chris Halse Rogers			Approve on 2016-02-26
Mir CI Bot	continuous-integration		Approve on 2016-02-26
Kevin DuBois (community)			Approve on 2016-02-25
Cemil Azizoglu (community)		2016-02-25	Approve on 2016-02-25
Review via email: mp+287136@code.launchpad.net