aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2009-12-01 10:40:17 -0600
committerTed Gould <ted@gould.cx>2009-12-01 10:40:17 -0600
commit8f0f2ad3c02996ce2362eab5383f0a4ab9175427 (patch)
treeaca7cc67b7274b2611c23717401ca8ed7d6e582f
parent824d1e8bc5bbc240140d6c2cea7246308c563fd8 (diff)
downloadlibayatana-indicator-8f0f2ad3c02996ce2362eab5383f0a4ab9175427.tar.gz
libayatana-indicator-8f0f2ad3c02996ce2362eab5383f0a4ab9175427.tar.bz2
libayatana-indicator-8f0f2ad3c02996ce2362eab5383f0a4ab9175427.zip
Making the timeout a failure case, and making it so that we want a graceful shutdown.
-rw-r--r--tests/service-manager-connect-service.c6
-rw-r--r--tests/service-manager-connect.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/service-manager-connect-service.c b/tests/service-manager-connect-service.c
index 297f3ba..dbdf4fa 100644
--- a/tests/service-manager-connect-service.c
+++ b/tests/service-manager-connect-service.c
@@ -8,7 +8,7 @@ static gboolean passed = FALSE;
gboolean
timeout (gpointer data)
{
- passed = TRUE;
+ passed = FALSE;
g_debug("Timeout with no shutdown.");
g_main_loop_quit(mainloop);
return FALSE;
@@ -17,8 +17,8 @@ timeout (gpointer data)
void
shutdown (void)
{
- g_error("Shutdown");
- passed = FALSE;
+ g_debug("Shutdown");
+ passed = TRUE;
g_main_loop_quit(mainloop);
return;
}
diff --git a/tests/service-manager-connect.c b/tests/service-manager-connect.c
index c252542..b62c2c9 100644
--- a/tests/service-manager-connect.c
+++ b/tests/service-manager-connect.c
@@ -37,6 +37,8 @@ main (int argc, char ** argv)
mainloop = g_main_loop_new(NULL, FALSE);
g_main_loop_run(mainloop);
+ g_object_unref(is);
+
g_debug("Quiting");
if (passed) {
g_debug("Passed");