diff options
| author | Ted Gould <ted@gould.cx> | 2010-07-13 10:55:21 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-07-13 10:55:21 -0500 |
| commit | 35cad52a3ea23e26761a2647241c47c4c3122761 (patch) | |
| tree | 2f6b5633c3c576fe19f2b140d879806b0e90d6e7 | |
| parent | 0de45ad20a3024bd46c93928cf10e6ccf9ff487b (diff) | |
| parent | 37d583e7c3fd530b2d32938dda0f470d47d424a5 (diff) | |
| download | libayatana-appindicator-35cad52a3ea23e26761a2647241c47c4c3122761.tar.gz libayatana-appindicator-35cad52a3ea23e26761a2647241c47c4c3122761.tar.bz2 libayatana-appindicator-35cad52a3ea23e26761a2647241c47c4c3122761.zip | |
* Merge upstream
* Fixing test for slower machines
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | tests/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/test-approver.c | 9 |
3 files changed, 17 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index a0a4d05..8f23d32 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-application (0.2.2-0ubuntu2~ppa2) UNRELEASED; urgency=low + + * Merge upstream + * Fixing test for slower machines + + -- Ted Gould <ted@ubuntu.com> Tue, 13 Jul 2010 10:55:02 -0500 + indicator-application (0.2.2-0ubuntu2~ppa1) lucid; urgency=low * Merge upstream 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); |