Merge lp:~larsu/dbus-test-runner/fix-test-race into lp:dbus-test-runner/15.10

[Lars Karlitski]

test-param-wait-system: fix race between tasks

Calling RequestName with gdbus-tool to signal the tested binary that a name is owned is racy: since the name is only owned very shortly, the watch might not have been established before the name is already gone again.

Fix this by holding on to the name a bit longer with the test-own-name helper (add a --system flag to that). A better fix would be to only start the second task when the watch has been established. dbus-test-runner always starts tasks in parallel though and changing this would further complicate its command line interface.

test-param-wait-system: fix race between tasks

Calling RequestName with gdbus-tool to signal the tested binary that a name is owned is racy: since the name is only owned very shortly, the watch might not have been established before the name is already gone again.

Fix this by holding on to the name a bit longer with the test-own-name helper (add a --system flag to that). A better fix would be to only start the second task when the watch has been established. dbus-test-runner always starts tasks in parallel though and changing this would further complicate its command line interface.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:96
http://jenkins.qa.ubuntu.com/job/dbus-test-runner-ci/38/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-test-runner-wily-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-test-runner-wily-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-test-runner-wily-i386-ci/2

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

review: Approve (continuous-integration)

[Iain Lane (laney)]

thanks, let's upload this!

review: Approve

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2015-01-30 17:10:47 +0000
+++ tests/Makefile.am	2015-09-09 07:37:42 +0000
@@ -121,9 +121,9 @@
 XFAIL_TESTS += test-param-only-wait
 
 TESTS += test-param-wait-system
-test-param-wait-system: Makefile.am
+test-param-wait-system: Makefile.am test-own-name
 	@echo "#!/bin/sh" > $@
-	@echo $(DBUS_RUNNER) --bus-type=system --task ls --task-bus=system --wait-for org.test.test --task gdbus --parameter call --parameter --system --parameter --dest --parameter org.freedesktop.DBus --parameter --object-path --parameter / --parameter --method --parameter org.freedesktop.DBus.RequestName --parameter org.test.test --parameter 0 --task-bus=system >> $@
+	@echo $(DBUS_RUNNER) --bus-type=system --task ls --task-bus=system --wait-for org.test.test --task $(builddir)/test-own-name --parameter --system --parameter org.test.test --ignore-return --task-bus=system >> $@
 	@chmod +x $@
 
 TESTS += test-param-multi-wait

=== modified file 'tests/test-own-name.c'
--- tests/test-own-name.c	2013-01-29 20:32:11 +0000
+++ tests/test-own-name.c	2015-09-09 07:37:42 +0000
@@ -18,10 +18,27 @@
 int
 main (int argc, char * argv[])
 {
+	gboolean system_bus = FALSE;
+	GOptionContext *options;
+	GError *error = NULL;
+
+	const GOptionEntry option_entries[] = {
+		{ "system", 'y', G_OPTION_FLAG_NONE, G_OPTION_ARG_NONE, &system_bus, "Own the name on the system bus", NULL },
+		{ NULL }
+	};
+
 #ifndef GLIB_VERSION_2_36
 	g_type_init();
 #endif
 
+	options = g_option_context_new(NULL);
+	g_option_context_add_main_entries(options, option_entries, NULL);
+	if (!g_option_context_parse(options, &argc, &argv, &error)) {
+		g_printerr("%s", error->message);
+		g_error_free(error);
+		return 1;
+	}
+
 	if (argc != 2) {
 		g_error("ARG, need a single argument");
 		return 1;
@@ -29,7 +46,7 @@
 
 	g_debug("Trying for name: %s", argv[1]);
 
-	g_bus_own_name(G_BUS_TYPE_SESSION,
+	g_bus_own_name(system_bus ? G_BUS_TYPE_SYSTEM : G_BUS_TYPE_SESSION,
 	               argv[1],
 	               G_BUS_NAME_OWNER_FLAGS_NONE,
 	               NULL, /* bus aquired */
@@ -43,7 +60,9 @@
 	g_timeout_add_seconds(2, end_of_line, mainloop);
 
 	g_main_loop_run(mainloop);
+
 	g_main_loop_unref(mainloop);
+	g_option_context_free(options);
 
 	g_debug("Quitting");