Merge lp:~alan-griffiths/mir/spike-nested-server-test-fixture into lp:mir

[Alan Griffiths]

tests: rework the "nested" tests so that they can actually be run

tests: rework the "nested" tests so that they can actually be run

We need a *lot* more testing around the nested use cases, but restoring the tests we have is a valid first step.

[Kevin DuBois (kdub)]

commented out code:
232 +// EXPECT_CALL(*this, eglInitialize(_, _, _)).Times(1).WillRepeatedly(
233 +// DoAll(WithArgs<1, 2>(Invoke(this, &NestedMockEGL::egl_initialize)), Return(EGL_TRUE)));

looks good otherwise!

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1730
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2009/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/716
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/722
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/716/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/530/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/528
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/528/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2148
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2148/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/1884/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8901

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2009/rebuild

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

@https://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/1884/console
> [ FAILED ] ServerShutdown/OnSignal.removes_endpoint_on_signal/0, where GetParam() = 3
> [ FAILED ] ServerShutdown/OnSignal.removes_endpoint_on_signal/1, where GetParam() = 6
> [ FAILED ] ServerShutdown/OnSignal.removes_endpoint_on_signal/2, where GetParam() = 8
> [ FAILED ] ServerShutdown/OnSignal.removes_endpoint_on_signal/3, where GetParam() = 11
> [ FAILED ] ServerShutdown/OnSignal.removes_endpoint_on_signal/4, where GetParam() = 7

More mako instability?

@https://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/530/console
> Start 4: mir_acceptance_tests
> Build timed out (after 240 minutes). Marking the build as failed.

Weird, but we see this intermittently and it isn't obvious that the time went anywhere related.

We'll see what happens after I delete the comment Kevin spotted.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1732
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2018/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/726
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/732
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/726/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/539/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/537
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/537/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2176
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2176/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/1890/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8924

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2018/rebuild

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

If running all the acceptance tests (not just the groups that ctests runs) there's an interaction with ServerShutdown/OnSignal.removes_endpoint_on_signal/* (which now hangs/times out)

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

> If running all the acceptance tests (not just the groups that ctests runs)
> there's an interaction with
> ServerShutdown/OnSignal.removes_endpoint_on_signal/* (which now hangs/times
> out)

Fixed the immediate problem, but there's still a potential issue with "emergency cleanup" of multiple in-process servers. Will tease out a test case for a future MP.

review: Abstain

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1733
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2020/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/732
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/738
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/731/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/541/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/539
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/539/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2209
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2209/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/1895/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8952

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2020/rebuild

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

"Build timed out (after 60 minutes). Marking the build as failed."

rebuilding

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1733
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2023/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/738
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/744
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/737
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/544
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/544/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/542
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/542/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2238
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2238/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/1900
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8984

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2023/rebuild

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

okay, lgtm

review: Approve

[Alexandros Frantzis (afrantzis)]

221 struct NestedServerConfiguration : FakeCommandLine, public mir::DefaultServerConfiguration
332 +struct NestedServer : mtf::InProcessServer, HostServerConfiguration

Not a blocker, but inheriting from FakeCommandLine (pre-existing) or from HostServerConfiguration is a convenience that makes little conceptual sense (vs composition), and may create some confusion.

review: Approve

=== modified file 'include/server/mir/default_server_configuration.h'
--- include/server/mir/default_server_configuration.h	2014-06-23 17:40:57 +0000
+++ include/server/mir/default_server_configuration.h	2014-06-27 14:49:35 +0000
@@ -98,6 +98,7 @@
 }
 namespace graphics
 {
+class NativePlatform;
 class Platform;
 class Display;
 class BufferInitializer;
@@ -164,6 +165,7 @@
     virtual std::shared_ptr<ServerStatusListener>   the_server_status_listener();
     virtual std::shared_ptr<DisplayChanger>         the_display_changer();
     virtual std::shared_ptr<graphics::Platform>     the_graphics_platform();
+    virtual std::shared_ptr<graphics::NativePlatform>  the_graphics_native_platform();
     virtual std::shared_ptr<input::InputConfiguration> the_input_configuration();
     virtual std::shared_ptr<input::InputDispatcher> the_input_dispatcher();
     virtual std::shared_ptr<input::InputSender>     the_input_sender();
@@ -331,6 +333,7 @@
     CachedPtr<shell::InputTargeter> input_targeter;
     CachedPtr<input::CursorListener> cursor_listener;
     CachedPtr<graphics::Platform>     graphics_platform;
+    CachedPtr<graphics::NativePlatform>    graphics_native_platform;
     CachedPtr<graphics::BufferInitializer> buffer_initializer;
     CachedPtr<graphics::GraphicBufferAllocator> buffer_allocator;
     CachedPtr<graphics::Display>      display;
@@ -367,7 +370,8 @@
     CachedPtr<compositor::CompositorReport> compositor_report;
     CachedPtr<logging::Logger> logger;
     CachedPtr<graphics::DisplayReport> display_report;
-    CachedPtr<time::Clock> clock;
+    // static to workaround the singleton clock in AsioMainLoop when running multiple servers
+    static CachedPtr<time::Clock> clock;
     CachedPtr<MainLoop> main_loop;
     CachedPtr<ServerStatusListener> server_status_listener;
     CachedPtr<graphics::DisplayConfigurationPolicy> display_configuration_policy;

=== modified file 'src/server/default_server_configuration.cpp'
--- src/server/default_server_configuration.cpp	2014-06-17 22:07:15 +0000
+++ src/server/default_server_configuration.cpp	2014-06-27 14:49:35 +0000
@@ -147,6 +147,8 @@
         });
 }
 
+mir::CachedPtr<mir::time::Clock> mir::DefaultServerConfiguration::clock;
+
 std::shared_ptr<mir::time::Clock> mir::DefaultServerConfiguration::the_clock()
 {
     return clock(

=== modified file 'src/server/graphics/default_configuration.cpp'
--- src/server/graphics/default_configuration.cpp	2014-06-24 21:44:55 +0000
+++ src/server/graphics/default_configuration.cpp	2014-06-27 14:49:35 +0000
@@ -70,22 +70,31 @@
     return graphics_platform(
         [this]()->std::shared_ptr<mg::Platform>
         {
-            auto graphics_lib = mir::load_library(the_options()->get<std::string>(options::platform_graphics_lib));
-
             if (!the_options()->is_set(options::host_socket_opt))
             {
                 // fallback to standalone if host socket is unset
+                auto graphics_lib = mir::load_library(the_options()->get<std::string>(options::platform_graphics_lib));
                 auto create_platform = graphics_lib->load_function<mg::CreatePlatform>("create_platform");
                 return create_platform(the_options(), the_emergency_cleanup(), the_display_report());
             }
 
-            auto create_native_platform = graphics_lib->load_function<mg::CreateNativePlatform>("create_native_platform");
-
             return std::make_shared<mir::graphics::nested::NestedPlatform>(
                 the_host_connection(),
                 the_input_dispatcher(),
                 the_display_report(),
-                create_native_platform(the_display_report()));
+                the_graphics_native_platform());
+        });
+}
+
+std::shared_ptr<mg::NativePlatform>  mir::DefaultServerConfiguration::the_graphics_native_platform()
+{
+    return graphics_native_platform(
+        [this]()
+        {
+            auto graphics_lib = mir::load_library(the_options()->get<std::string>(options::platform_graphics_lib));
+            auto create_native_platform = graphics_lib->load_function<mg::CreateNativePlatform>("create_native_platform");
+
+            return create_native_platform(the_display_report());
         });
 }
 

=== modified file 'src/server/graphics/nested/nested_display.cpp'
--- src/server/graphics/nested/nested_display.cpp	2014-06-02 17:07:02 +0000
+++ src/server/graphics/nested/nested_display.cpp	2014-06-27 14:49:35 +0000
@@ -215,10 +215,6 @@
                 });
         });
 
-    if (result.empty())
-        BOOST_THROW_EXCEPTION(std::runtime_error("Nested Mir needs at least one output for display"));
-
-
     {
         std::unique_lock<std::mutex> lock(outputs_mutex);
         outputs.swap(result);

=== modified file 'src/server/run_mir.cpp'
--- src/server/run_mir.cpp	2014-06-02 17:07:02 +0000
+++ src/server/run_mir.cpp	2014-06-27 14:49:35 +0000
@@ -24,6 +24,7 @@
 #include "mir/raii.h"
 #include "mir/emergency_cleanup.h"
 
+#include <atomic>
 #include <exception>
 #include <mutex>
 #include <csignal>
@@ -82,9 +83,11 @@
 
     weak_emergency_cleanup = config.the_emergency_cleanup();
 
+    static std::atomic<unsigned int> concurrent_calls{0};
+
     auto const raii = raii::paired_calls(
-        [&]{ for (auto sig : intercepted) old_handler[sig] = signal(sig, fatal_signal_cleanup); },
-        [&]{ for (auto sig : intercepted) signal(sig, old_handler[sig]); });
+        [&]{ if (!concurrent_calls++) for (auto sig : intercepted) old_handler[sig] = signal(sig, fatal_signal_cleanup); },
+        [&]{ if (!--concurrent_calls) for (auto sig : intercepted) signal(sig, old_handler[sig]); });
 
     init(server);
     server.run();

=== modified file 'tests/acceptance-tests/test_nested_mir.cpp'
--- tests/acceptance-tests/test_nested_mir.cpp	2014-06-11 16:11:32 +0000
+++ tests/acceptance-tests/test_nested_mir.cpp	2014-06-27 14:49:35 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013-2014 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3,
@@ -17,23 +17,21 @@
  */
 
 #include "mir/frontend/session_mediator_report.h"
+#include "mir/graphics/native_platform.h"
 #include "mir/display_server.h"
 #include "mir/run_mir.h"
 
-#include "mir_test_framework/display_server_test_fixture.h"
-#include "mir_test_doubles/mock_gl.h"
+#include "mir_test_framework/in_process_server.h"
+#include "mir_test_framework/stubbed_server_configuration.h"
+
 #include "mir_test_doubles/mock_egl.h"
 
-#ifndef ANDROID
-#include "mir_test_doubles/mock_gbm.h"
-#endif
-
+#include <gtest/gtest.h>
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
 
 namespace mf = mir::frontend;
+namespace mg = mir::graphics;
 namespace mtf = mir_test_framework;
-
 using namespace testing;
 
 namespace
@@ -67,7 +65,7 @@
     void session_error(const std::string&, const char*, const std::string&) override {};
 };
 
-struct HostServerConfiguration : public mtf::TestingServerConfiguration
+struct HostServerConfiguration : mtf::StubbedServerConfiguration
 {
     virtual std::shared_ptr<mf::SessionMediatorReport>  the_session_mediator_report()
     {
@@ -97,13 +95,61 @@
     }
 };
 
+struct NativePlatformAdapter : mg::NativePlatform
+{
+    NativePlatformAdapter(std::shared_ptr<mg::Platform> const& adaptee) :
+        adaptee(adaptee) {}
+
+    void initialize(std::shared_ptr<mg::NestedContext> const& /*nested_context*/) override {}
+
+    std::shared_ptr<mg::GraphicBufferAllocator> create_buffer_allocator(
+        std::shared_ptr<mg::BufferInitializer> const& buffer_initializer) override
+    {
+        return adaptee->create_buffer_allocator(buffer_initializer);
+    }
+
+    std::shared_ptr<mg::PlatformIPCPackage> get_ipc_package() override
+    {
+        return adaptee->get_ipc_package();
+    }
+
+    std::shared_ptr<mg::InternalClient> create_internal_client() override
+    {
+        return adaptee->create_internal_client();
+    }
+
+    void fill_buffer_package(
+        mg::BufferIPCPacker* packer,
+        mg::Buffer const* buffer,
+        mg::BufferIpcMsgType msg_type) const override
+    {
+        return adaptee->fill_buffer_package(packer, buffer, msg_type);
+    }
+
+    std::shared_ptr<mg::Platform> const adaptee;
+};
+
 struct NestedServerConfiguration : FakeCommandLine, public mir::DefaultServerConfiguration
 {
-    NestedServerConfiguration(std::string const& host_socket) :
+    NestedServerConfiguration(
+        std::string const& host_socket,
+        std::shared_ptr<mg::Platform> const& graphics_platform) :
         FakeCommandLine(host_socket),
-        DefaultServerConfiguration(FakeCommandLine::argc, FakeCommandLine::argv)
-    {
-    }
+        DefaultServerConfiguration(FakeCommandLine::argc, FakeCommandLine::argv),
+        graphics_platform(graphics_platform)
+    {
+    }
+
+    std::shared_ptr<mg::NativePlatform> the_graphics_native_platform() override
+    {
+        return graphics_native_platform(
+            [this]() -> std::shared_ptr<mg::NativePlatform>
+            {
+                return std::make_shared<NativePlatformAdapter>(graphics_platform);
+            });
+    }
+
+    std::shared_ptr<mg::Platform> const graphics_platform;
 };
 
 struct NestedMockEGL : mir::test::doubles::MockEGL
@@ -113,13 +159,6 @@
         {
             InSequence init_before_terminate;
             EXPECT_CALL(*this, eglGetDisplay(_)).Times(1);
-
-            EXPECT_CALL(*this, eglInitialize(_, _, _)).Times(1).WillRepeatedly(
-                DoAll(WithArgs<1, 2>(Invoke(this, &NestedMockEGL::egl_initialize)), Return(EGL_TRUE)));
-
-            EXPECT_CALL(*this, eglChooseConfig(_, _, _, _, _)).Times(AnyNumber()).WillRepeatedly(
-                DoAll(WithArgs<2, 4>(Invoke(this, &NestedMockEGL::egl_choose_config)), Return(EGL_TRUE)));
-
             EXPECT_CALL(*this, eglTerminate(_)).Times(1);
         }
 
@@ -127,6 +166,18 @@
         EXPECT_CALL(*this, eglMakeCurrent(_, _, _, _)).Times(AnyNumber());
         EXPECT_CALL(*this, eglDestroySurface(_, _)).Times(AnyNumber());
 
+        EXPECT_CALL(*this, eglQueryString(_, _)).Times(AnyNumber());
+        ON_CALL(*this, eglQueryString(_,EGL_EXTENSIONS))
+            .WillByDefault(Return("EGL_KHR_image "
+                                  "EGL_KHR_image_base "
+                                  "EGL_MESA_drm_image"));
+
+        EXPECT_CALL(*this, eglChooseConfig(_, _, _, _, _)).Times(AnyNumber()).WillRepeatedly(
+            DoAll(WithArgs<2, 4>(Invoke(this, &NestedMockEGL::egl_choose_config)), Return(EGL_TRUE)));
+
+        EXPECT_CALL(*this, eglGetCurrentContext()).Times(AnyNumber());
+        EXPECT_CALL(*this, eglCreatePbufferSurface(_, _, _)).Times(AnyNumber());
+
         EXPECT_CALL(*this, eglGetProcAddress(StrEq("eglCreateImageKHR"))).Times(AnyNumber());
         EXPECT_CALL(*this, eglGetProcAddress(StrEq("eglDestroyImageKHR"))).Times(AnyNumber());
         EXPECT_CALL(*this, eglGetProcAddress(StrEq("glEGLImageTargetTexture2DOES"))).Times(AnyNumber());
@@ -147,117 +198,39 @@
     }
 };
 
-struct NestedMockPlatform
-#ifndef ANDROID
-    : mir::test::doubles::MockGBM
-#endif
-{
-    NestedMockPlatform()
-    {
-#ifndef ANDROID
-        InSequence gbm_device_lifecycle;
-        EXPECT_CALL(*this, gbm_create_device(_)).Times(1);
-        EXPECT_CALL(*this, gbm_device_destroy(_)).Times(1);
-#endif
-    }
-};
-
-struct NestedMockGL : NiceMock<mir::test::doubles::MockGL>
-{
-    NestedMockGL() {}
-};
-
-template<class NestedServerConfiguration>
-struct ClientConfig : mtf::TestingClientConfiguration
-{
-    ClientConfig(std::string const& host_socket) : host_socket(host_socket) {}
-
-    std::string const host_socket;
-
-    void exec() override
-    {
-        try
-        {
-            NestedMockPlatform mock_gbm;
-            NestedMockEGL mock_egl;
-            NestedMockGL mock_gl;
-            NestedServerConfiguration nested_config(host_socket);
-
-            mir::run_mir(nested_config, [](mir::DisplayServer& server){server.stop();});
-
-            // TODO - remove FAIL() as we should exit (NB we need logic to cause exit).
-            FAIL();
-        }
-        catch (std::exception const& x)
-        {
-            // TODO - this is only temporary until NestedPlatform is implemented.
-            EXPECT_THAT(x.what(), HasSubstr("Platform::create_buffer_allocator is not implemented yet!"));
-        }
+struct NestedServer : mtf::InProcessServer, HostServerConfiguration
+{
+    NestedMockEGL mock_egl;
+
+    virtual mir::DefaultServerConfiguration& server_config()
+    {
+        return *this;
     }
 };
 }
 
-using TestNestedMir = mtf::BespokeDisplayServerTestFixture;
-
-// TODO resolve problems running "nested" tests on android and running nested on MESA
-#ifdef ANDROID
-#define DISABLED_ON_ANDROID_AND_MESA(name) DISABLED_##name
-#else
-#define DISABLED_ON_ANDROID_AND_MESA(name) DISABLED_##name
-#endif
-
-TEST_F(TestNestedMir, DISABLED_ON_ANDROID_AND_MESA(nested_platform_connects_and_disconnects))
+TEST_F(NestedServer, nested_platform_connects_and_disconnects)
 {
-    struct MyHostServerConfiguration : HostServerConfiguration
-    {
-        void exec() override
-        {
-            InSequence seq;
-            EXPECT_CALL(*mock_session_mediator_report, session_connect_called(_)).Times(1);
-            EXPECT_CALL(*mock_session_mediator_report, session_disconnect_called(_)).Times(1);
-        }
-    };
-
-    MyHostServerConfiguration host_config;
-    ClientConfig<NestedServerConfiguration> client_config(host_config.the_socket_file());
-
-
-    launch_server_process(host_config);
-    launch_client_process(client_config);
+    std::string const connection_string{new_connection()};
+    NestedServerConfiguration nested_config{connection_string, the_graphics_platform()};
+
+    InSequence seq;
+    EXPECT_CALL(*mock_session_mediator_report, session_connect_called(_)).Times(1);
+    EXPECT_CALL(*mock_session_mediator_report, session_disconnect_called(_)).Times(1);
+
+    mir::run_mir(nested_config, [](mir::DisplayServer& server){server.stop();});
 }
 
 //////////////////////////////////////////////////////////////////
-// TODO the following tests were used in investigating lifetime issues.
-// TODO they may not have much long term value, but decide that later
-
-TEST(DisplayLeak, on_exit_display_objects_should_be_destroyed)
-{
-    struct MyServerConfiguration : mtf::TestingServerConfiguration
-    {
-        std::shared_ptr<mir::graphics::Display> the_display() override
-        {
-            auto const& temp = mtf::TestingServerConfiguration::the_display();
-            my_display = temp;
-            return temp;
-        }
-
-        std::weak_ptr<mir::graphics::Display> my_display;
-    };
-
-    MyServerConfiguration host_config;
-
-    mir::run_mir(host_config, [](mir::DisplayServer& server){server.stop();});
-
-    EXPECT_FALSE(host_config.my_display.lock()) << "after run_mir() exits the display should be released";
-}
-
-TEST_F(TestNestedMir, DISABLED_ON_ANDROID_AND_MESA(on_exit_display_objects_should_be_destroyed))
-{
-    struct MyNestedServerConfiguration : NestedServerConfiguration
-    {
-        // TODO clang says "error: inheriting constructors are not supported"
-        // using NestedServerConfiguration::NestedServerConfiguration;
-        MyNestedServerConfiguration(std::string const& host_socket) : NestedServerConfiguration(host_socket) {}
+// TODO the following test was used in investigating lifetime issues.
+// TODO it may not have much long term value, but decide that later.
+TEST_F(NestedServer, on_exit_display_objects_should_be_destroyed)
+{
+    std::string const connection_string{new_connection()};
+
+    struct MyServerConfiguration : NestedServerConfiguration
+    {
+        using NestedServerConfiguration::NestedServerConfiguration;
 
         std::shared_ptr<mir::graphics::Display> the_display() override
         {
@@ -266,17 +239,12 @@
             return temp;
         }
 
-        ~MyNestedServerConfiguration()
-        {
-            EXPECT_FALSE(my_display.lock()) << "after run_mir() exits the display should be released";
-        }
-
         std::weak_ptr<mir::graphics::Display> my_display;
     };
 
-    HostServerConfiguration host_config;
-    ClientConfig<MyNestedServerConfiguration> client_config(host_config.the_socket_file());
-
-    launch_server_process(host_config);
-    launch_client_process(client_config);
+    MyServerConfiguration config{connection_string, the_graphics_platform()};
+
+    mir::run_mir(config, [](mir::DisplayServer& server){server.stop();});
+
+    EXPECT_FALSE(config.my_display.lock()) << "after run_mir() exits the display should be released";
 }