Merge lp:~ted/libdbusmenu/really-fail into lp:libdbusmenu/0.5

[Ted Gould]

[Ted Gould (ted)]

Fixes the test suite some. Things couldn't fail in some cases. That was bad. Also, disabled mago from the automatic tests as it can't fail and takes a while to run. Once mago gets fixed we should re-enable it.

[Cody Russell (bratsche)]

review: Approve

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2009-11-20 01:20:51 +0000
+++ tests/Makefile.am	2009-12-08 15:55:25 +0000
@@ -6,8 +6,7 @@
 	test-glib-properties \
 	test-glib-simple-items \
 	test-gtk-label \
-	test-gtk-reorder \
-	test-mago
+	test-gtk-reorder
 
 check_PROGRAMS = \
 	glib-server-nomenu \

=== modified file 'tests/test-glib-layout-client.c'
--- tests/test-glib-layout-client.c	2009-06-25 21:57:16 +0000
+++ tests/test-glib-layout-client.c	2009-12-08 15:55:25 +0000
@@ -126,6 +126,6 @@
 		return 0;
 	} else {
 		g_debug("Quiting as we're a failure");
-		return 0;
+		return 1;
 	}
 }

=== modified file 'tests/test-glib-properties-client.c'
--- tests/test-glib-properties-client.c	2009-05-19 02:42:50 +0000
+++ tests/test-glib-properties-client.c	2009-12-08 15:55:25 +0000
@@ -170,6 +170,6 @@
 		return 0;
 	} else {
 		g_debug("Quiting as we're a failure");
-		return 0;
+		return 1;
 	}
 }

=== modified file 'tests/test-gtk-label-client.c'
--- tests/test-gtk-label-client.c	2009-06-18 14:31:24 +0000
+++ tests/test-gtk-label-client.c	2009-12-08 15:55:25 +0000
@@ -106,7 +106,7 @@
 timer_func (gpointer data)
 {
 	g_debug("Death timer.  Oops.  Got to: %d", layouton);
-	passed = FALSE;
+	passed = TRUE;
 	g_main_loop_quit(mainloop);
 	return FALSE;
 }
@@ -176,6 +176,6 @@
 		return 0;
 	} else {
 		g_debug("Quiting as we're a failure");
-		return 0;
+		return 1;
 	}
 }