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

Proposed by Charles Kerr on 2012-09-20
Status: Merged
Approved by: Lars Karlitski on 2012-09-20
Approved revision: 425
Merged at revision: 423
Proposed branch: lp:~charlesk/libdbusmenu/fix-json-tests
Merge into: lp:libdbusmenu/12.10
Diff against target: 21 lines (+2/-2)
1 file modified
tests/Makefile.am (+2/-2)
To merge this branch: bzr merge lp:~charlesk/libdbusmenu/fix-json-tests
Reviewer Review Type Date Requested Status
Lars Karlitski (community) 2012-09-20 Approve on 2012-09-20
Review via email: mp+125378@code.launchpad.net

Commit message

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

Description of the change

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.

To post a comment you must log in.
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) wrote :

Looks correct.

review: Approve
Charles Kerr (charlesk) wrote :

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

Manually pushed up to revision 423.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/Makefile.am'
2--- tests/Makefile.am 2012-06-12 06:55:51 +0000
3+++ tests/Makefile.am 2012-09-20 00:09:19 +0000
4@@ -237,7 +237,7 @@
5 @echo export UBUNTU_MENUPROXY="" >> $@
6 @echo export G_DEBUG=fatal_criticals >> $@
7 @echo $(XVFB_RUN) >> $@
8- @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 >> $@
9+ @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 >> $@
10 @echo diff $(srcdir)/test-json-01.json test-json-01.output.json \> /dev/null >> $@
11 @chmod +x $@
12
13@@ -281,7 +281,7 @@
14 @echo export UBUNTU_MENUPROXY="" >> $@
15 @echo export G_DEBUG=fatal_criticals >> $@
16 @echo $(XVFB_RUN) >> $@
17- @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 >> $@
18+ @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 >> $@
19 @chmod +x $@
20
21 EXTRA_DIST += \

Subscribers

People subscribed via source and target branches

to all changes: