Merge lp:~charlesk/libdbusmenu/fix-json-tests into lp:libdbusmenu/12.10

[Charles Kerr]

In the unit tests, don't ignore the return value of test-json-client and test-json-server

The test-json* tests are failing about 3/4 of the time on my machine due to timing issues caused by the dbus-test-runner behavior described in bug #1053168

test-json-server and test-json-client always return 0 which should make dbus-test-runner happy unless one of the tasks is abort()ed somehow, in which case the test should fail anyway. So test-json*'s use of --ignore-return is unnecessary anyway.

This patch removes test-json*'s use of --ignore-return.

[lp:~charlesk/libdbusmenu/fix-json-tests]

425. By Charles Kerr on 2012-09-20

Undo r423, I found this bug while preparing the dbusmenu release but forgot to revert the version before pushing this branch.

[Lars Karlitski (larsu)]

Looks correct.

review: Approve

[Charles Kerr (charlesk)]

Hmm, looks like we don't autoland dbusmenu patches?

Manually pushed up to revision 423.

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2012-06-12 06:55:51 +0000
+++ tests/Makefile.am	2012-09-20 00:09:19 +0000
@@ -237,7 +237,7 @@
 	@echo export UBUNTU_MENUPROXY="" >> $@
 	@echo export G_DEBUG=fatal_criticals >> $@
 	@echo $(XVFB_RUN) >> $@
-	@echo $(DBUS_RUNNER) --task ./test-json-client --wait-for org.dbusmenu.test --task-name Client --parameter $(top_builddir)/tools/dbusmenu-dumper --parameter test-json-01.output.json --ignore-return --task ./test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json --ignore-return >> $@
+	@echo $(DBUS_RUNNER) --task ./test-json-client --wait-for org.dbusmenu.test --task-name Client --parameter $(top_builddir)/tools/dbusmenu-dumper --parameter test-json-01.output.json --task ./test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json >> $@
 	@echo diff $(srcdir)/test-json-01.json test-json-01.output.json \> /dev/null >> $@
 	@chmod +x $@
 
@@ -281,7 +281,7 @@
 	@echo export UBUNTU_MENUPROXY="" >> $@
 	@echo export G_DEBUG=fatal_criticals >> $@
 	@echo $(XVFB_RUN) >> $@
-	@echo $(DBUS_RUNNER) --task $(builddir)/test-json-client --wait-for org.dbusmenu.test --task-name Client --parameter $(top_builddir)/tools/dbusmenu-dumper --parameter /dev/null --ignore-return --task libtool --parameter --mode=execute --parameter $(srcdir)/test-json-instruction-count --parameter $(builddir)/test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json --ignore-return >> $@
+	@echo $(DBUS_RUNNER) --task $(builddir)/test-json-client --wait-for org.dbusmenu.test --task-name Client --parameter $(top_builddir)/tools/dbusmenu-dumper --parameter /dev/null --task libtool --parameter --mode=execute --parameter $(srcdir)/test-json-instruction-count --parameter $(builddir)/test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json >> $@
 	@chmod +x $@
 
 EXTRA_DIST += \