Merge lp:~afrantzis/mir/fix-server-configuration-options-ptest into lp:mir

[Alexandros Frantzis]

tests: Fix ServerConfigurationOptions test to run safely with ptest

tests: Fix ServerConfigurationOptions test to run safely with ptest

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

PASSED: Continuous integration, rev:3617
https://mir-jenkins.ubuntu.com/job/mir-ci/1365/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/1631
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1684
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1675
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1675
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1675
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1646
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1646/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1646
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1646/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/1646
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1646/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/1646
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1646/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1646
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1646/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

OK

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/432/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1636/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/463/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1689
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1680
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1680
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1680
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1651/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1651
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1651/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/1651
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1651/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/1651
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1651/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1651
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1651/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Autolanding failure is bug #1606418

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

review: Approve (continuous-integration)

=== modified file 'tests/acceptance-tests/server_configuration_options.cpp'
--- tests/acceptance-tests/server_configuration_options.cpp	2016-07-07 11:14:26 +0000
+++ tests/acceptance-tests/server_configuration_options.cpp	2016-07-28 12:34:42 +0000
@@ -25,9 +25,21 @@
 
 #include <cstdlib>
 #include <fstream>
+#include <system_error>
 
 using namespace testing;
 
+namespace
+{
+std::string create_temp_dir()
+{
+    char temp_dir[] = "temp_dir_XXXXXX";
+    if (mkdtemp(temp_dir) == nullptr)
+        throw std::system_error(errno, std::system_category(), "Failed to create temp dir");
+
+    return temp_dir;
+}
+
 struct ServerConfigurationOptions : mir_test_framework::HeadlessTest
 {
     MOCK_METHOD1(command_line_handler, void(std::vector<std::string> const&));
@@ -46,11 +58,9 @@
 
         server.add_configuration_option(test_config_key, "", mir::OptionType::string);
 
-        clean_test_files();
-
-        add_to_environment(env_xdg_config_home, fake_xdg_config_home);
-        add_to_environment(env_home, fake_home);
-        add_to_environment(env_xdg_config_dirs, fake_xdg_config_dirs);
+        add_to_environment(env_xdg_config_home, fake_xdg_config_home.c_str());
+        add_to_environment(env_home, fake_home.c_str());
+        add_to_environment(env_xdg_config_dirs, fake_xdg_config_dirs.c_str());
     }
 
     void TearDown() override
@@ -64,21 +74,13 @@
     static constexpr char const* const env_home = "HOME";
     static constexpr char const* const env_xdg_config_dirs = "XDG_CONFIG_DIRS";
 
-    static constexpr char const* const fake_xdg_config_home = "fake_xdg_config_home";
-    static constexpr char const* const fake_home = "fake_home";
-    static constexpr char const* const fake_home_config = "fake_home/.config";
-    static constexpr char const* const fake_xdg_config_dirs =
-        "fake_xdg_config_dir0:fake_xdg_config_dir1";
-    static constexpr char const* const fake_xdg_config_dir0 = "fake_xdg_config_dir0";
-    static constexpr char const* const fake_xdg_config_dir1 = "fake_xdg_config_dir1";
-
     static constexpr char const* const not_found = "not found";
     std::string const config_filename{"test.config"};
     static constexpr char const* const test_config_key = "config_dir";
 
-    void create_config_file_in(char const* dir)
+    void create_config_file_in(std::string const& dir)
     {
-        mkdir(dir, 0700);
+        mkdir(dir.c_str(), 0700);
 
         auto const filename = dir + ('/' + config_filename);
 
@@ -86,10 +88,10 @@
         config << test_config_key << '=' << dir << std::endl;
     }
 
-    void remove_config_file_in(char const* dir)
+    void remove_config_file_in(std::string const& dir)
     {
         remove((dir + ('/' + config_filename)).c_str());
-        remove(dir);
+        remove(dir.c_str());
     }
 
     void clean_test_files()
@@ -98,9 +100,20 @@
         remove_config_file_in(fake_xdg_config_dir1);
         remove_config_file_in(fake_xdg_config_home);
         remove_config_file_in(fake_home_config);
-        remove(fake_home);
+        remove(fake_home.c_str());
+        remove(temp_dir.c_str());
     }
+
+    std::string const temp_dir = create_temp_dir();
+    std::string const fake_xdg_config_home = temp_dir + "/fake_xdg_config_home";
+    std::string const fake_home = temp_dir + "/fake_home";
+    std::string const fake_home_config = temp_dir + "/fake_home/.config";
+    std::string const fake_xdg_config_dir0 = temp_dir + "/fake_xdg_config_dir0";
+    std::string const fake_xdg_config_dir1 = temp_dir + "/fake_xdg_config_dir1";
+    std::string const fake_xdg_config_dirs =
+        fake_xdg_config_dir0 + ":" + fake_xdg_config_dir1;
 };
+}
 
 TEST_F(ServerConfigurationOptions, unknown_command_line_options_are_passed_to_handler)
 {
@@ -137,7 +150,7 @@
 
 TEST_F(ServerConfigurationOptions, are_read_from_home_config_file)
 {
-    mkdir(fake_home, 0700);
+    mkdir(fake_home.c_str(), 0700);
     create_config_file_in(fake_home_config);
 
     // $HOME is only used if $XDG_CONFIG_HOME isn't set