diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2013-01-30 11:06:26 +0000 |
|---|---|---|
| committer | Tarmac <Unknown> | 2013-01-30 11:06:26 +0000 |
| commit | bd333ad26f451f27f0d412f8a42f42459377bd7c (patch) | |
| tree | 88817c7c7f21fc3c63395767e9c42acd588eefef /tests/test-libappindicator-fallback-watcher.c | |
| parent | ee33a9adfc9c657c3be11a8bcaf25e687fdde026 (diff) | |
| parent | 3e9b3f1cd28e9c9e1263796297f5d648a163be9e (diff) | |
| download | libayatana-appindicator-bd333ad26f451f27f0d412f8a42f42459377bd7c.tar.gz libayatana-appindicator-bd333ad26f451f27f0d412f8a42f42459377bd7c.tar.bz2 libayatana-appindicator-bd333ad26f451f27f0d412f8a42f42459377bd7c.zip | |
This is a continuation of ~mathieu-tl/libappindicator/fix-test-merge/ which adds fixes for bug #1102589, bug #1102595, bug #1109128, and bug #1103087, which should get it finally passing CI. Fixes: https://bugs.launchpad.net/bugs/1102589, https://bugs.launchpad.net/bugs/1102595, https://bugs.launchpad.net/bugs/1103087, https://bugs.launchpad.net/bugs/1109128.
Approved by Ted Gould, PS Jenkins bot.
Diffstat (limited to 'tests/test-libappindicator-fallback-watcher.c')
| -rw-r--r-- | tests/test-libappindicator-fallback-watcher.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/test-libappindicator-fallback-watcher.c b/tests/test-libappindicator-fallback-watcher.c index 5494082..2648902 100644 --- a/tests/test-libappindicator-fallback-watcher.c +++ b/tests/test-libappindicator-fallback-watcher.c @@ -58,8 +58,6 @@ kill_func (gpointer userdata) int main (int argv, char ** argc) { - g_type_init(); - g_debug("Waiting to init."); @@ -77,6 +75,7 @@ main (int argv, char ** argc) while (!has_owner && owner_count < 10000) { org_freedesktop_DBus_name_has_owner(bus_proxy, "org.test", &has_owner, NULL); owner_count++; + g_usleep(500000); } if (owner_count == 10000) { @@ -104,7 +103,7 @@ main (int argv, char ** argc) /* This is the final kill function. It really shouldn't happen unless we get an error. */ - g_timeout_add(2000, kill_func, NULL); + g_timeout_add_seconds(20, kill_func, NULL); g_debug("Entering Mainloop"); |