Merge lp:~mardy/dbus-test-runner/lp1201409 into lp:dbus-test-runner/13.10

[Alberto Mardegan]

Propagate the current environment to activated services

Do not clear the environment when starting dbus-daemon. This means that the
current environment will be available to all the services activated by the
daemon, in the same way that it is available to the processes given to the
dbus-test-runner command line.

Propagate the current environment to activated services

Do not clear the environment when starting dbus-daemon. This means that the
current environment will be available to all the services activated by the
daemon, in the same way that it is available to the processes given to the
dbus-test-runner command line.

[Ken VanDine (ken-vandine)]

I'm worried what the effects on all the existing packages using this might be. We might get flooded with test failures if tests expect a clean environment. Most tests probably don't, I just don't know.

[Alberto Mardegan (mardy)]

I think that most users of dbus-test-runner will not use the activation feature, and just specify the processes to run on the command line.
But anyway, if desired I can make this fix conditional, depending on a --keep-env command-line option.

[lp:~mardy/dbus-test-runner/lp1201409]

64. By Alberto Mardegan on 2013-07-15

Let the client decide whether to keep the environment

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:63
http://jenkins.qa.ubuntu.com/job/dbus-test-runner-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-test-runner-quantal-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-test-runner-quantal-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-test-runner-saucy-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-test-runner-saucy-armhf-ci/1

Click here to trigger a rebuild:
http://s-jenkins:8080/job/dbus-test-runner-ci/1/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:64
http://jenkins.qa.ubuntu.com/job/dbus-test-runner-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-test-runner-quantal-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-test-runner-quantal-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-test-runner-saucy-amd64-ci/2
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-test-runner-saucy-armhf-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/dbus-test-runner-ci/2/rebuild

review: Needs Fixing (continuous-integration)

[Alberto Mardegan (mardy)]

I added a command line argument to toggle the environment propagation behaviour. :-)

[Ken VanDine (ken-vandine)]

Thanks

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'libdbustest/service.c'
--- libdbustest/service.c	2013-02-21 17:33:04 +0000
+++ libdbustest/service.c	2013-07-15 13:35:30 +0000
@@ -58,6 +58,7 @@
 	gchar * dbus_configfile;
 
 	gboolean first_time;
+	gboolean keep_env;
 
 	DbusTestWatchdog * watchdog;
 	guint watchdog_source;
@@ -111,6 +112,7 @@
 	self->priv->dbus_configfile = g_strdup(DEFAULT_SESSION_CONF);
 
 	self->priv->first_time = TRUE;
+	self->priv->keep_env = FALSE;
 
 	self->priv->watchdog = g_object_new(DBUS_TEST_TYPE_WATCHDOG, NULL);
 	self->priv->watchdog_source = g_timeout_add_seconds_full(G_PRIORITY_DEFAULT,
@@ -413,7 +415,7 @@
 	gchar * dbus_startup[] = {service->priv->dbus_daemon, "--config-file", service->priv->dbus_configfile, "--print-address", NULL};
 	g_spawn_async_with_pipes(g_get_current_dir(),
 	                         dbus_startup, /* argv */
-	                         blank, /* envp */
+	                         service->priv->keep_env ? NULL : blank, /* envp */
 	                         G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, /* flags */
 	                         (GSpawnChildSetupFunc) dbus_child_setup, /* child setup func */
 	                         NULL, /* child setup data */
@@ -613,6 +615,13 @@
 }
 
 void
+dbus_test_service_set_keep_environment (DbusTestService * service, gboolean keep_env)
+{
+	g_return_if_fail(DBUS_TEST_IS_SERVICE(service));
+	service->priv->keep_env = keep_env;
+}
+
+void
 dbus_test_service_stop (DbusTestService * service)
 {
 	g_return_if_fail(DBUS_TEST_IS_SERVICE(service));

=== modified file 'libdbustest/service.h'
--- libdbustest/service.h	2012-04-22 18:22:22 +0000
+++ libdbustest/service.h	2013-07-15 13:35:30 +0000
@@ -68,6 +68,7 @@
 
 void dbus_test_service_set_daemon (DbusTestService * service, const gchar * daemon);
 void dbus_test_service_set_conf_file (DbusTestService * service, const gchar * conffile);
+void dbus_test_service_set_keep_environment (DbusTestService * service, gboolean keep_env);
 
 G_END_DECLS
 

=== modified file 'src/dbus-test-runner.c'
--- src/dbus-test-runner.c	2013-02-21 17:33:04 +0000
+++ src/dbus-test-runner.c	2013-07-15 13:35:30 +0000
@@ -24,6 +24,7 @@
 #include <libdbustest/dbus-test.h>
 
 static gint max_wait = 30;
+static gboolean keep_env = FALSE;
 static DbusTestProcess * last_task = NULL;
 static DbusTestService * service = NULL;
 static gboolean timeout = FALSE;
@@ -161,6 +162,7 @@
 	{"bustle-monitor", 0,   0,                       G_OPTION_ARG_FILENAME,  &bustle_cmd,      "Path to the Bustle DBus Monitor to use.  Defaults to 'bustle-dbus-monitor'.", "executable"},
 	{"bustle-data",  'b',   0,                       G_OPTION_ARG_FILENAME,  &bustle_datafile, "A file to write out data from the bustle logger to.", "data_file"},
 	{"max-wait",     'm',   0,                       G_OPTION_ARG_INT,       &max_wait,        "The maximum amount of time the test runner will wait for the test to complete.  Default is 30 seconds.", "seconds"},
+	{"keep-env",     0,     0,                       G_OPTION_ARG_NONE,      &keep_env,        "Whether to propagate the execution environment to the dbus-server and all the services activated by it.  By default the environment is cleared.", NULL },
 	{ NULL, 0, 0, 0, NULL, NULL, NULL }
 };
 
@@ -225,6 +227,8 @@
 		g_timeout_add_seconds(max_wait, max_wait_hit, NULL);
 	}
 
+	dbus_test_service_set_keep_environment(service, keep_env);
+
 	/* These should all be in the service now */
 	if (last_task != NULL) {
 		g_object_unref(last_task);