Merge lp:~thomas-voss/dbus-cpp/adjust-fixture-to-correctly-replace-dbus-env-vars into lp:dbus-cpp

[Thomas Voß]

Factor out dbus-specific environment variable names into compile-time constants.
Make sure that environment variables are unset prior to setting.

Factor out dbus-specific environment variable names into compile-time constants.
Make sure that environment variables are unset prior to setting.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:76
http://jenkins.qa.ubuntu.com/job/dbus-cpp-ci/198/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-utopic-amd64-ci/38
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-utopic-armhf-ci/38
        deb: http://jenkins.qa.ubuntu.com/job/dbus-cpp-utopic-armhf-ci/38/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-utopic-i386-ci/38

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dbus-cpp-ci/198/rebuild

review: Approve (continuous-integration)

[Loïc Minier (lool)]

LGTM

review: Approve

=== modified file 'src/core/dbus/fixture.cpp.in'
--- src/core/dbus/fixture.cpp.in	2014-06-29 05:29:15 +0000
+++ src/core/dbus/fixture.cpp.in	2014-09-17 10:25:25 +0000
@@ -23,6 +23,29 @@
 #include <core/posix/exec.h>
 #include <core/posix/this_process.h>
 
+namespace
+{
+static constexpr const char* dbus_session_bus_address
+{
+    "DBUS_SESSION_BUS_ADDRESS"
+};
+
+static constexpr const char* dbus_system_bus_address
+{
+    "DBUS_SYSTEM_BUS_ADDRESS"
+};
+
+static constexpr const char* dbus_starter_address
+{
+    "DBUS_STARTER_ADDRESS"
+};
+
+static constexpr const char* dbus_starter_bus_type
+{
+    "DBUS_STARTER_BUS_TYPE"
+};
+}
+
 struct core::dbus::Fixture::Private
 {
     struct Session
@@ -56,9 +79,15 @@
             if (address.empty())
                 throw std::runtime_error("Session: Could not read address of bus instance.");
 
-            core::posix::this_process::env::set_or_throw("DBUS_SESSION_BUS_ADDRESS", address);
-            core::posix::this_process::env::set_or_throw("DBUS_STARTER_ADDRESS", address);
-            core::posix::this_process::env::set_or_throw("DBUS_STARTER_BUS_TYPE", "session");
+            // We clean up the env prior to injecting the new addresses.
+            std::error_code ec; // And just ignore all error codes.
+            core::posix::this_process::env::unset(dbus_session_bus_address, ec);
+            core::posix::this_process::env::unset(dbus_starter_address, ec);
+            core::posix::this_process::env::unset(dbus_starter_bus_type, ec);
+
+            core::posix::this_process::env::set_or_throw(dbus_session_bus_address, address);
+            core::posix::this_process::env::set_or_throw(dbus_starter_address, address);
+            core::posix::this_process::env::set_or_throw(dbus_starter_bus_type, "session");
         }
 
         ~Session()
@@ -108,7 +137,10 @@
             if (address.empty())
                 throw std::runtime_error("System: Could not read address of bus instance.");
 
-            core::posix::this_process::env::set_or_throw("DBUS_SYSTEM_BUS_ADDRESS", address);
+            // We clean up the env prior to injecting the new addresses.
+            std::error_code ec; // And just ignore all error codes.
+            core::posix::this_process::env::unset(dbus_system_bus_address, ec);
+            core::posix::this_process::env::set_or_throw(dbus_system_bus_address, address);
         }
 
         ~System()