aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-07-13 10:52:59 -0500
committerTed Gould <ted@gould.cx>2010-07-13 10:52:59 -0500
commit37d583e7c3fd530b2d32938dda0f470d47d424a5 (patch)
tree9b67254deaa4a995937fcaaa8645e014257d0714
parent7ef183418aaee73864e44d93b32e80962fdea07a (diff)
parente1dc7c00dd8f0d94f84dbd4fe626ea365a2543db (diff)
downloadlibayatana-appindicator-37d583e7c3fd530b2d32938dda0f470d47d424a5.tar.gz
libayatana-appindicator-37d583e7c3fd530b2d32938dda0f470d47d424a5.tar.bz2
libayatana-appindicator-37d583e7c3fd530b2d32938dda0f470d47d424a5.zip
Adjusting the tests so they can deal with slow systems better.
-rw-r--r--.bzrignore1
-rw-r--r--tests/Makefile.am1
-rw-r--r--tests/test-approver.c9
3 files changed, 11 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index ad46d0c..cbf5964 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -110,3 +110,4 @@ bindings/mono/policy.appindicator-sharp.dll
src/notification-approver-client.h
src/notification-approver-server.h
tests/test-approver
+tests/test-approver-tester
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 867d4de..f2bdbb2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -118,6 +118,7 @@ test_approver_LDADD = \
test-approver-tester: test-approver Makefile.am
@echo "#!/bin/bash" > $@
+ @echo export INDICATOR_SERVICE_SHUTDOWN_TIMEOUT=1000 >> $@
@echo . $(srcdir)/run-xvfb.sh >> $@
@echo $(DBUS_RUNNER) --task $(builddir)/test-approver --task-name Approver --task $(top_builddir)/src/indicator-application-service --task-name Service --ignore-return >> $@
@chmod +x $@
diff --git a/tests/test-approver.c b/tests/test-approver.c
index 30beb30..bc25761 100644
--- a/tests/test-approver.c
+++ b/tests/test-approver.c
@@ -136,6 +136,14 @@ check_for_service (gpointer user_data)
return TRUE;
}
+gboolean
+fail_timeout (gpointer user_data)
+{
+ g_debug("Failure timeout initiated.");
+ g_main_loop_quit(main_loop);
+ return FALSE;
+}
+
int
main (int argc, char ** argv)
{
@@ -156,6 +164,7 @@ main (int argc, char ** argv)
bus_proxy = dbus_g_proxy_new_for_name(session_bus, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
g_timeout_add(100, check_for_service, NULL);
+ g_timeout_add_seconds(2, fail_timeout, NULL);
main_loop = g_main_loop_new(NULL, FALSE);
g_main_loop_run(main_loop);