Merge lp:~afrantzis/mir/fix-shutdown-with-blocked-clients-test into lp:mir

[Alexandros Frantzis]

tests: Properly shut down blocked clients in ServerShutdown.server_can_shut_down_when_clients_are_blocked test

Properly shut down blocked clients to avoid memory errors and related races.

tests: Properly shut down blocked clients in ServerShutdown.server_can_shut_down_when_clients_are_blocked test

Properly shut down blocked clients to avoid memory errors and related races.

This has fixed various manifestations of problematic shut down scenarios locally, and is *probably* a fix for https://bugs.launchpad.net/mir/+bug/1335873 (which seems like another manifestation of the same core issue, but which I have not managed to reproduce locally exactly).

[Alan Griffiths (alan-griffiths)]

The change is sensible, I can't demonstrate it actually relates to the linked bug though.

review: Approve

[Robert Carr (robertcarr)]

Ditto

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1737
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2046/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/781
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/787
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/780
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/567
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/567/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/565
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/565/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2366
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2366/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/1936
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9102

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

review: Approve (continuous-integration)

[Alberto Aguirre (albaguirre)]

Looks ok.

review: Approve

=== modified file 'tests/acceptance-tests/test_server_shutdown.cpp'
--- tests/acceptance-tests/test_server_shutdown.cpp	2014-06-14 19:52:52 +0000
+++ tests/acceptance-tests/test_server_shutdown.cpp	2014-07-01 14:54:17 +0000
@@ -158,6 +158,10 @@
     std::shared_ptr<mtd::FakeEventHubInputConfiguration> input_configuration;
 };
 
+void null_lifecycle_callback(MirConnection*, MirLifecycleState, void*)
+{
+}
+
 }
 
 using ServerShutdown = BespokeDisplayServerTestFixture;
@@ -194,6 +198,9 @@
 
             ASSERT_TRUE(connection != NULL);
 
+            /* Default lifecycle handler terminates the process on disconnect, so override it */
+            mir_connection_set_lifecycle_event_callback(connection, null_lifecycle_callback, nullptr);
+
             MirSurfaceParameters const request_params =
             {
                 __PRETTY_FUNCTION__,
@@ -213,13 +220,7 @@
             next_buffer_done.set();
             server_done.wait();
 
-            /*
-             * TODO: Releasing the connection to a shut down server blocks
-             * the client. We should handle unexpected server shutdown more
-             * gracefully on the client side.
-             *
-             * mir_connection_release(connection);
-             */
+            mir_connection_release(connection);
         }
 
         Flag& next_buffer_done;