Merge lp:~alan-griffiths/mir/fix-1271604 into lp:mir

[Alan Griffiths]

tests: Override configuration to avoid creating an (unused) filesystem endpoint for connections when using InProcessServer

tests: Override configuration to avoid creating an (unused) filesystem endpoint for connections when using InProcessServer

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1346
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/710/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/707
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/703
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/308
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/440
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/440/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/444
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/444/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/308
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/308/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/321
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3265

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

review: Approve (continuous-integration)

[Andreas Pokorny (andreas-pokorny)]

lgtm

review: Approve

[Kevin DuBois (kdub)]

review: Approve

[Daniel van Vugt (vanvugt)]

Looks good.

BTW, a simpler way to write:
   char const* const env_no_file =
is:
   char const env_no_file[] =

review: Approve

=== modified file 'include/test/mir_test_framework/in_process_server.h'
--- include/test/mir_test_framework/in_process_server.h	2013-12-13 15:11:19 +0000
+++ include/test/mir_test_framework/in_process_server.h	2014-01-22 18:03:28 +0000
@@ -36,6 +36,7 @@
 /// Fixture for running Mir server in test process
 struct InProcessServer : testing::Test
 {
+    InProcessServer();
     ~InProcessServer();
 
     /// Starts the server
@@ -53,6 +54,7 @@
     mir::DisplayServer* start_mir_server();
     virtual mir::DefaultServerConfiguration& server_config() = 0;
 
+    char const* const old_env;
     std::thread server_thread;
     mir::DisplayServer* display_server = 0;
 };

=== modified file 'tests/mir_test_framework/in_process_server.cpp'
--- tests/mir_test_framework/in_process_server.cpp	2013-12-17 10:05:06 +0000
+++ tests/mir_test_framework/in_process_server.cpp	2014-01-22 18:03:28 +0000
@@ -30,6 +30,17 @@
 
 namespace mtf = mir_test_framework;
 
+namespace
+{
+char const* const env_no_file = "MIR_SERVER_NO_FILE";
+}
+
+mtf::InProcessServer::InProcessServer() :
+    old_env(getenv(env_no_file))
+{
+    if (!old_env) setenv(env_no_file, "", true);
+}
+
 void mtf::InProcessServer::SetUp()
 {
     display_server = start_mir_server();
@@ -53,6 +64,8 @@
 mtf::InProcessServer::~InProcessServer()
 {
     if (server_thread.joinable()) server_thread.join();
+
+    if (!old_env) unsetenv(env_no_file);
 }
 
 mir::DisplayServer* mtf::InProcessServer::start_mir_server()