diff -Nru dbus-test-runner-15.04.0+15.04.20150218/debian/changelog dbus-test-runner-15.04.0+15.04.20160906/debian/changelog --- dbus-test-runner-15.04.0+15.04.20150218/debian/changelog 2016-09-06 14:36:31.000000000 +0000 +++ dbus-test-runner-15.04.0+15.04.20160906/debian/changelog 2016-09-06 14:36:31.000000000 +0000 @@ -1,3 +1,23 @@ +dbus-test-runner (15.04.0+15.04.20160906-0ubuntu1) vivid; urgency=medium + + * Adjusting all the waits to be 60 seconds + + -- Ted Gould Tue, 06 Sep 2016 14:33:59 +0000 + +dbus-test-runner (15.04.0+15.10.20151002-0ubuntu1) wily; urgency=medium + + [ Lars Uebernickel ] + * test-param-wait-system: fix race between tasks + + -- Iain Lane Fri, 02 Oct 2015 17:10:06 +0000 + +dbus-test-runner (15.04.0+15.04.20150218-0ubuntu2) wily; urgency=medium + + * debian/tests/control: bustle-pcap has been split out into its own package. + Add a test-dep on that. + + -- Iain Lane Fri, 12 Jun 2015 10:08:11 +0100 + dbus-test-runner (15.04.0+15.04.20150218-0ubuntu1) vivid; urgency=medium [ CI Train Bot ] diff -Nru dbus-test-runner-15.04.0+15.04.20150218/debian/tests/control dbus-test-runner-15.04.0+15.04.20160906/debian/tests/control --- dbus-test-runner-15.04.0+15.04.20150218/debian/tests/control 2016-09-06 14:36:31.000000000 +0000 +++ dbus-test-runner-15.04.0+15.04.20160906/debian/tests/control 2016-09-06 14:36:31.000000000 +0000 @@ -1,3 +1,3 @@ Tests: with-bustle -Depends: dbus-test-runner, bustle, build-essential, intltool, pkg-config, libdbus-glib-1-dev, python3-dbusmock +Depends: dbus-test-runner, bustle, bustle-pcap, build-essential, intltool, pkg-config, libdbus-glib-1-dev, python3-dbusmock Restrictions: build-needed diff -Nru dbus-test-runner-15.04.0+15.04.20150218/libdbustest/leash.c dbus-test-runner-15.04.0+15.04.20160906/libdbustest/leash.c --- dbus-test-runner-15.04.0+15.04.20150218/libdbustest/leash.c 2015-02-18 03:44:46.000000000 +0000 +++ dbus-test-runner-15.04.0+15.04.20160906/libdbustest/leash.c 2016-09-06 14:33:44.000000000 +0000 @@ -44,7 +44,7 @@ g_source_remove(timer); } - timer = g_timeout_add_seconds(30, destroy_everyone, NULL); + timer = g_timeout_add_seconds(60, destroy_everyone, NULL); return; } diff -Nru dbus-test-runner-15.04.0+15.04.20150218/libdbustest/watchdog.c dbus-test-runner-15.04.0+15.04.20160906/libdbustest/watchdog.c --- dbus-test-runner-15.04.0+15.04.20150218/libdbustest/watchdog.c 2015-02-18 03:44:46.000000000 +0000 +++ dbus-test-runner-15.04.0+15.04.20160906/libdbustest/watchdog.c 2016-09-06 14:33:44.000000000 +0000 @@ -78,7 +78,7 @@ GError * error = NULL; - /* Spawn the watchdog, we now have 30 secs */ + /* Spawn the watchdog, we now have 60 secs */ g_spawn_async (NULL, /* cwd */ argv, NULL, /* env */ diff -Nru dbus-test-runner-15.04.0+15.04.20150218/src/dbus-test-runner.c dbus-test-runner-15.04.0+15.04.20160906/src/dbus-test-runner.c --- dbus-test-runner-15.04.0+15.04.20150218/src/dbus-test-runner.c 2015-02-18 03:44:46.000000000 +0000 +++ dbus-test-runner-15.04.0+15.04.20160906/src/dbus-test-runner.c 2016-09-06 14:33:44.000000000 +0000 @@ -24,7 +24,7 @@ #include static DbusTestServiceBus bus_type = DBUS_TEST_SERVICE_BUS_SESSION; -static gint max_wait = 30; +static gint max_wait = 60; static gboolean keep_env = FALSE; static DbusTestProcess * last_task = NULL; static DbusTestService * service = NULL; diff -Nru dbus-test-runner-15.04.0+15.04.20150218/tests/Makefile.am dbus-test-runner-15.04.0+15.04.20160906/tests/Makefile.am --- dbus-test-runner-15.04.0+15.04.20150218/tests/Makefile.am 2015-02-18 03:44:46.000000000 +0000 +++ dbus-test-runner-15.04.0+15.04.20160906/tests/Makefile.am 2016-09-06 14:33:36.000000000 +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 diff -Nru dbus-test-runner-15.04.0+15.04.20150218/tests/test-own-name.c dbus-test-runner-15.04.0+15.04.20160906/tests/test-own-name.c --- dbus-test-runner-15.04.0+15.04.20150218/tests/test-own-name.c 2015-02-18 03:44:46.000000000 +0000 +++ dbus-test-runner-15.04.0+15.04.20160906/tests/test-own-name.c 2016-09-06 14:33:36.000000000 +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");