Merge lp:~vanvugt/mir/test-without-entropy into lp:mir

[Daniel van Vugt]

Add regression tests for the evil /dev/random hangs and crashes
we see when starting a Mir server (LP: #1536662 and LP: #1541188)

It's not a fix but it is a start.

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3342
https://mir-jenkins.ubuntu.com/job/mir-ci/399/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/197
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/215
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/211
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/211
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/202
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/202/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/202
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/202/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/202
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/202/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/202
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/202/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/399/rebuild

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

+TEST(MirCookieAuthority, DISABLED_does_not_hang_or_crash)

Not an informative test name. How about following the BDD "given/when/then" style? Vis:

TEST(MirCookieAuthority, DISABLED_given_low_entropy_when_starting_then_does_not_hang_or_crash)

[Cemil Azizoglu (cemil-azizoglu)]

Ok

review: Approve

[Kevin DuBois (kdub)]

assuming there's a good reason they're disabled, lgtm.

review: Approve

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3344
https://mir-jenkins.ubuntu.com/job/mir-ci/407/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/207
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/231
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/223
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/223
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/213
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/213/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/213
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/213/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/213
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/213/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/213
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/213/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/213
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/213/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/407/rebuild

review: Approve (continuous-integration)

[Chris Halse Rogers (raof)]

Seems reasonable.

review: Approve

=== modified file 'tests/acceptance-tests/test_server_startup.cpp'
--- tests/acceptance-tests/test_server_startup.cpp	2015-02-22 07:46:25 +0000
+++ tests/acceptance-tests/test_server_startup.cpp	2016-02-26 03:39:01 +0000
@@ -18,11 +18,13 @@
  */
 
 #include "mir_test_framework/interprocess_client_server_test.h"
+#include "mir_test_framework/headless_in_process_server.h"
 #include "mir_test_framework/detect_server.h"
 
 #include <chrono>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
+#include <fcntl.h>
 
 namespace mf = mir::frontend;
 namespace mc = mir::compositor;
@@ -65,3 +67,30 @@
                                            std::chrono::milliseconds(100)));
         });
 }
+
+TEST(ServerStartupReliability, DISABLED_can_start_with_low_entropy)
+{   // Regression test for LP: #1536662 and LP: #1541188
+    using namespace ::testing;
+
+    // Flush the entropy pool
+    int fd = open("/dev/random", O_RDONLY | O_NONBLOCK);
+    ASSERT_THAT(fd, Ge(0));
+    char buf[256];
+    while (read(fd, buf, sizeof buf) > 0) {}
+    close(fd);
+
+    auto start = std::chrono::high_resolution_clock::now();
+
+    struct Server : mtf::HeadlessInProcessServer
+    {
+        void TestBody() override {}
+    } server;
+
+    EXPECT_NO_THROW(server.SetUp(););
+
+    auto duration = std::chrono::high_resolution_clock::now() - start;
+    int seconds = std::chrono::duration_cast<std::chrono::seconds>(duration).count();
+    EXPECT_THAT(seconds, Lt(15));
+
+    server.TearDown();
+}

=== modified file 'tests/unit-tests/test_mir_cookie.cpp'
--- tests/unit-tests/test_mir_cookie.cpp	2016-01-29 08:18:22 +0000
+++ tests/unit-tests/test_mir_cookie.cpp	2016-02-26 03:39:01 +0000
@@ -22,6 +22,9 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
+#include <chrono>
+#include <fcntl.h>
+
 TEST(MirCookieAuthority, attests_real_timestamp)
 {
     std::vector<uint8_t> secret{ 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0xde, 0x01 };
@@ -115,3 +118,23 @@
     EXPECT_THAT(mir::cookie::Authority::optimal_secret_size(),
         Ge(mir::cookie::Authority::minimum_secret_size));
 }
+
+TEST(MirCookieAuthority, DISABLED_given_low_entropy_does_not_hang_or_crash)
+{   // Regression test for LP: #1536662 and LP: #1541188
+    using namespace testing;
+
+    // Flush the entropy pool
+    int fd = open("/dev/random", O_RDONLY | O_NONBLOCK);
+    ASSERT_THAT(fd, Ge(0));
+    char buf[256];
+    while (read(fd, buf, sizeof buf) > 0) {}
+    close(fd);
+
+    auto start = std::chrono::high_resolution_clock::now();
+
+    EXPECT_NO_THROW( mir::cookie::Authority::create() );
+
+    auto duration = std::chrono::high_resolution_clock::now() - start;
+    int seconds = std::chrono::duration_cast<std::chrono::seconds>(duration).count();
+    EXPECT_THAT(seconds, Lt(15));
+}