From fc573dc11ca279d7a6aaf3c5164fb6e772f8d37c Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Thu, 29 Oct 2009 11:34:44 -0500
Subject: Creating a new test and linking it into things.

---
 tests/Makefile.am                | 18 +++++++++++++++-
 tests/service-shutdown-timeout.c | 45 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 tests/service-shutdown-timeout.c

(limited to 'tests')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8121136..fc83186 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,7 @@
 
 check_PROGRAMS = \
-	test-loader
+	test-loader \
+	service-shutdown-timeout
 
 lib_LTLIBRARIES = \
 	libdummy-indicator-blank.la \
@@ -76,6 +77,21 @@ libdummy_indicator_simple_la_LDFLAGS = \
 	-module \
 	-avoid-version
 
+#############################
+# Service Shutdown Timeout
+#############################
+
+service_shutdown_timeout_SOURCES = \
+	service-shutdown-timeout.c
+
+service_shutdown_timeout_CFLAGS = \
+	-Wall -Werror \
+	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+
+service_shutdown_timeout_LDADD = \
+	$(LIBINDICATOR_LIBS) \
+	$(top_builddir)/libindicator/.libs/libindicator.a
+
 #############################
 # Test stuff
 #############################
diff --git a/tests/service-shutdown-timeout.c b/tests/service-shutdown-timeout.c
new file mode 100644
index 0000000..9682202
--- /dev/null
+++ b/tests/service-shutdown-timeout.c
@@ -0,0 +1,45 @@
+
+#include <glib.h>
+#include "libindicator/indicator-service.h"
+
+static GMainLoop * mainloop = NULL;
+static gboolean passed = FALSE;
+
+gboolean
+timeout (gpointer data)
+{
+	passed = FALSE;
+	g_error("Timeout with no shutdown.");
+	g_main_loop_quit(mainloop);
+	return FALSE;
+}
+
+void
+shutdown (void)
+{
+	g_debug("Shutdown");
+	g_main_loop_quit(mainloop);
+	return;
+}
+
+int
+main (int argc, char ** argv)
+{
+	g_type_init();
+
+	IndicatorService * is = indicator_service_new("my.test.name");
+	g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_SIGNAL_SHUTDOWN, shutdown, NULL);
+
+	g_timeout_add_seconds(1, timeout, NULL);
+
+	mainloop = g_main_loop_new(NULL, FALSE);
+	g_main_loop_run(mainloop);
+
+	g_debug("Quiting");
+	if (passed) {
+		g_debug("Passed");
+		return 0;
+	}
+	g_debug("Failed");
+	return 1;
+}
-- 
cgit v1.2.3


From a72fc583b5ae76ee0d4183ae72e4d905c0304bb7 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Thu, 29 Oct 2009 12:57:56 -0500
Subject: Making the gtester stuff into a autotest thingy.

---
 tests/Makefile.am | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'tests')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index fc83186..bacdce6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,3 +1,5 @@
+TESTS =
+DISTCLEANFILES =
 
 check_PROGRAMS = \
 	test-loader \
@@ -99,10 +101,13 @@ service_shutdown_timeout_LDADD = \
 XML_REPORT  = loader-check-results.xml
 HTML_REPORT = loader-check-results.html
 
-loader-tester: test-loader libdummy-indicator-null.la libdummy-indicator-simple.la
-	@gtester -k --verbose -o=$(XML_REPORT) ./test-loader
+loader-tester: test-loader libdummy-indicator-null.la libdummy-indicator-simple.la Makefile
+	@echo "#!/bin/sh" > loader-tester
+	@echo gtester -k --verbose -o=$(XML_REPORT) ./test-loader >> loader-tester
+	@chmod +x loader-tester
 
-check-local: loader-tester
+TESTS += loader-tester
+DISTCLEANFILES += loader-tester
 
-DISTCLEANFILES = $(XML_REPORT) $(HTML_REPORT)
+DISTCLEANFILES += $(XML_REPORT) $(HTML_REPORT)
 
-- 
cgit v1.2.3


From 22a5b08a9ddb76888f580141617d67a319fbfad9 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Thu, 29 Oct 2009 13:03:39 -0500
Subject: Woot!  A failing test.  Look how TDD I am.

---
 tests/Makefile.am | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'tests')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index bacdce6..485d02e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,6 +10,8 @@ lib_LTLIBRARIES = \
 	libdummy-indicator-null.la \
 	libdummy-indicator-simple.la
 
+DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf
+
 #############################
 # Test Loader
 #############################
@@ -94,6 +96,14 @@ service_shutdown_timeout_LDADD = \
 	$(LIBINDICATOR_LIBS) \
 	$(top_builddir)/libindicator/.libs/libindicator.a
 
+service-shutdown-timeout-tester: service-shutdown-timeout Makefile
+	@echo "#!/bin/sh" > service-shutdown-timeout-tester
+	@echo $(DBUS_RUNNER) --task ./service-shutdown-timeout >> service-shutdown-timeout-tester
+	@chmod +x service-shutdown-timeout-tester
+
+TESTS += service-shutdown-timeout-tester
+DISTCLEANFILES += service-shutdown-timeout-tester
+
 #############################
 # Test stuff
 #############################
-- 
cgit v1.2.3


From 74296a68665e9c582c37a61894a9c1ba1630cb9d Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Thu, 29 Oct 2009 17:22:29 -0500
Subject: Oops, forgot to set to passed.

---
 tests/service-shutdown-timeout.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tests')

diff --git a/tests/service-shutdown-timeout.c b/tests/service-shutdown-timeout.c
index 9682202..666739a 100644
--- a/tests/service-shutdown-timeout.c
+++ b/tests/service-shutdown-timeout.c
@@ -18,6 +18,7 @@ void
 shutdown (void)
 {
 	g_debug("Shutdown");
+	passed = TRUE;
 	g_main_loop_quit(mainloop);
 	return;
 }
-- 
cgit v1.2.3


From 911b9d7f93b4319665b5fa63b84032df230412ba Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Fri, 30 Oct 2009 17:18:10 -0500
Subject: Adding a test that ensures we don't get a connect signal.

---
 tests/Makefile.am                  | 24 ++++++++++++++++++++
 tests/service-manager-no-connect.c | 46 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 tests/service-manager-no-connect.c

(limited to 'tests')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 485d02e..dd047d3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,6 +3,7 @@ DISTCLEANFILES =
 
 check_PROGRAMS = \
 	test-loader \
+	service-manager-no-connect \
 	service-shutdown-timeout
 
 lib_LTLIBRARIES = \
@@ -104,6 +105,29 @@ service-shutdown-timeout-tester: service-shutdown-timeout Makefile
 TESTS += service-shutdown-timeout-tester
 DISTCLEANFILES += service-shutdown-timeout-tester
 
+#############################
+# Service Manager No Connect
+#############################
+
+service_manager_no_connect_SOURCES = \
+	service-manager-no-connect.c
+
+service_manager_no_connect_CFLAGS = \
+	-Wall -Werror \
+	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+
+service_manager_no_connect_LDADD = \
+	$(LIBINDICATOR_LIBS) \
+	$(top_builddir)/libindicator/.libs/libindicator.a
+
+service-manager-no-connect-tester: service-manager-no-connect Makefile
+	@echo "#!/bin/sh" > service-manager-no-connect-tester
+	@echo $(DBUS_RUNNER) --task ./service-manager-no-connect >> service-manager-no-connect-tester
+	@chmod +x service-manager-no-connect-tester
+
+TESTS += service-manager-no-connect-tester
+DISTCLEANFILES += service-manager-no-connect-tester
+
 #############################
 # Test stuff
 #############################
diff --git a/tests/service-manager-no-connect.c b/tests/service-manager-no-connect.c
new file mode 100644
index 0000000..8006eda
--- /dev/null
+++ b/tests/service-manager-no-connect.c
@@ -0,0 +1,46 @@
+
+#include <glib.h>
+#include "libindicator/indicator-service-manager.h"
+
+static GMainLoop * mainloop = NULL;
+static gboolean passed = FALSE;
+
+gboolean
+timeout (gpointer data)
+{
+	passed = TRUE;
+	g_error("Timeout with no connection.");
+	g_main_loop_quit(mainloop);
+	return FALSE;
+}
+
+void
+connection (void)
+{
+	g_debug("Connection");
+	passed = FALSE;
+	g_main_loop_quit(mainloop);
+	return;
+}
+
+int
+main (int argc, char ** argv)
+{
+	g_type_init();
+
+	IndicatorServiceManager * is = indicator_service_manager_new("my.test.name");
+	g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, connection, NULL);
+
+	g_timeout_add_seconds(1, timeout, NULL);
+
+	mainloop = g_main_loop_new(NULL, FALSE);
+	g_main_loop_run(mainloop);
+
+	g_debug("Quiting");
+	if (passed) {
+		g_debug("Passed");
+		return 0;
+	}
+	g_debug("Failed");
+	return 1;
+}
-- 
cgit v1.2.3


From 0745e42d7032a400e1661da94faef05de7be7527 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Mon, 2 Nov 2009 09:31:43 -0600
Subject: Ah, we can't throw an error on success.

---
 tests/service-manager-no-connect.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/service-manager-no-connect.c b/tests/service-manager-no-connect.c
index 8006eda..1c32eb2 100644
--- a/tests/service-manager-no-connect.c
+++ b/tests/service-manager-no-connect.c
@@ -9,7 +9,7 @@ gboolean
 timeout (gpointer data)
 {
 	passed = TRUE;
-	g_error("Timeout with no connection.");
+	g_debug("Timeout with no connection.");
 	g_main_loop_quit(mainloop);
 	return FALSE;
 }
@@ -27,6 +27,7 @@ int
 main (int argc, char ** argv)
 {
 	g_type_init();
+	g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
 
 	IndicatorServiceManager * is = indicator_service_manager_new("my.test.name");
 	g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, connection, NULL);
-- 
cgit v1.2.3


From 9a15eec1f5fc9609b877a411564abbf600a22ee5 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Mon, 2 Nov 2009 11:17:10 -0600
Subject: Adding in the basic data needed to start bringing up a test to start
 the service.

---
 tests/Makefile.am                       | 41 +++++++++++++++++++++++++++-
 tests/service-manager-connect-service.c | 46 ++++++++++++++++++++++++++++++++
 tests/service-manager-connect.c         | 47 +++++++++++++++++++++++++++++++++
 tests/session.conf.in                   | 40 ++++++++++++++++++++++++++++
 4 files changed, 173 insertions(+), 1 deletion(-)
 create mode 100644 tests/service-manager-connect-service.c
 create mode 100644 tests/service-manager-connect.c
 create mode 100644 tests/session.conf.in

(limited to 'tests')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index dd047d3..744c807 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,6 +4,8 @@ DISTCLEANFILES =
 check_PROGRAMS = \
 	test-loader \
 	service-manager-no-connect \
+	service-manager-connect \
+	service-manager-connect-service \
 	service-shutdown-timeout
 
 lib_LTLIBRARIES = \
@@ -120,7 +122,7 @@ service_manager_no_connect_LDADD = \
 	$(LIBINDICATOR_LIBS) \
 	$(top_builddir)/libindicator/.libs/libindicator.a
 
-service-manager-no-connect-tester: service-manager-no-connect Makefile
+service-manager-no-connect-tester: service-manager-no-connect Makefile.am
 	@echo "#!/bin/sh" > service-manager-no-connect-tester
 	@echo $(DBUS_RUNNER) --task ./service-manager-no-connect >> service-manager-no-connect-tester
 	@chmod +x service-manager-no-connect-tester
@@ -128,6 +130,43 @@ service-manager-no-connect-tester: service-manager-no-connect Makefile
 TESTS += service-manager-no-connect-tester
 DISTCLEANFILES += service-manager-no-connect-tester
 
+#############################
+# Service Manager Connect
+#############################
+
+session.conf: session.conf.in Makefile.am
+	sed -e "s|\@servicedir\@|$(abspath $(builddir))|" $< > $@
+
+service_manager_connect_SOURCES = \
+	service-manager-connect.c
+
+service_manager_connect_CFLAGS = \
+	-Wall -Werror \
+	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+
+service_manager_connect_LDADD = \
+	$(LIBINDICATOR_LIBS) \
+	$(top_builddir)/libindicator/.libs/libindicator.a
+
+service_manager_connect_service_SOURCES = \
+	service-manager-connect-service.c
+
+service_manager_connect_service_CFLAGS = \
+	-Wall -Werror \
+	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+
+service_manager_connect_service_LDADD = \
+	$(LIBINDICATOR_LIBS) \
+	$(top_builddir)/libindicator/.libs/libindicator.a
+
+service-manager-connect-tester: service-manager-connect service-manager-connect-service session.conf Makefile.am
+	@echo "#!/bin/sh" > service-manager-connect-tester
+	@echo dbus-test-runner --dbus-config $(builddir)/session.conf --task ./service-manager-connect >> service-manager-connect-tester
+	@chmod +x service-manager-connect-tester
+
+TESTS += service-manager-connect-tester
+DISTCLEANFILES += service-manager-connect-tester
+
 #############################
 # Test stuff
 #############################
diff --git a/tests/service-manager-connect-service.c b/tests/service-manager-connect-service.c
new file mode 100644
index 0000000..666739a
--- /dev/null
+++ b/tests/service-manager-connect-service.c
@@ -0,0 +1,46 @@
+
+#include <glib.h>
+#include "libindicator/indicator-service.h"
+
+static GMainLoop * mainloop = NULL;
+static gboolean passed = FALSE;
+
+gboolean
+timeout (gpointer data)
+{
+	passed = FALSE;
+	g_error("Timeout with no shutdown.");
+	g_main_loop_quit(mainloop);
+	return FALSE;
+}
+
+void
+shutdown (void)
+{
+	g_debug("Shutdown");
+	passed = TRUE;
+	g_main_loop_quit(mainloop);
+	return;
+}
+
+int
+main (int argc, char ** argv)
+{
+	g_type_init();
+
+	IndicatorService * is = indicator_service_new("my.test.name");
+	g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_SIGNAL_SHUTDOWN, shutdown, NULL);
+
+	g_timeout_add_seconds(1, timeout, NULL);
+
+	mainloop = g_main_loop_new(NULL, FALSE);
+	g_main_loop_run(mainloop);
+
+	g_debug("Quiting");
+	if (passed) {
+		g_debug("Passed");
+		return 0;
+	}
+	g_debug("Failed");
+	return 1;
+}
diff --git a/tests/service-manager-connect.c b/tests/service-manager-connect.c
new file mode 100644
index 0000000..1c32eb2
--- /dev/null
+++ b/tests/service-manager-connect.c
@@ -0,0 +1,47 @@
+
+#include <glib.h>
+#include "libindicator/indicator-service-manager.h"
+
+static GMainLoop * mainloop = NULL;
+static gboolean passed = FALSE;
+
+gboolean
+timeout (gpointer data)
+{
+	passed = TRUE;
+	g_debug("Timeout with no connection.");
+	g_main_loop_quit(mainloop);
+	return FALSE;
+}
+
+void
+connection (void)
+{
+	g_debug("Connection");
+	passed = FALSE;
+	g_main_loop_quit(mainloop);
+	return;
+}
+
+int
+main (int argc, char ** argv)
+{
+	g_type_init();
+	g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
+
+	IndicatorServiceManager * is = indicator_service_manager_new("my.test.name");
+	g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, connection, NULL);
+
+	g_timeout_add_seconds(1, timeout, NULL);
+
+	mainloop = g_main_loop_new(NULL, FALSE);
+	g_main_loop_run(mainloop);
+
+	g_debug("Quiting");
+	if (passed) {
+		g_debug("Passed");
+		return 0;
+	}
+	g_debug("Failed");
+	return 1;
+}
diff --git a/tests/session.conf.in b/tests/session.conf.in
new file mode 100644
index 0000000..d1e2805
--- /dev/null
+++ b/tests/session.conf.in
@@ -0,0 +1,40 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  <!-- If we fork, keep the user's original umask to avoid affecting
+       the behavior of child processes. -->
+  <keep_umask/>
+
+  <listen>unix:tmpdir=/tmp</listen>
+
+  <servicedir>@servicedir@</servicedir>
+
+  <policy context="default">
+    <!-- Allow everything to be sent -->
+    <allow send_destination="*" eavesdrop="true"/>
+    <!-- Allow everything to be received -->
+    <allow eavesdrop="true"/>
+    <!-- Allow anyone to own anything -->
+    <allow own="*"/>
+  </policy>
+
+  <!-- raise the service start timeout to 40 seconds as it can timeout
+       on the live cd on slow machines -->
+  <limit name="service_start_timeout">60000</limit>
+
+  <!-- the memory limits are 1G instead of say 4G because they can't exceed 32-bit signed int max -->
+  <limit name="max_incoming_bytes">1000000000</limit>
+  <limit name="max_outgoing_bytes">1000000000</limit>
+  <limit name="max_message_size">1000000000</limit>
+  <limit name="service_start_timeout">120000</limit>  
+  <limit name="auth_timeout">240000</limit>
+  <limit name="max_completed_connections">100000</limit>  
+  <limit name="max_incomplete_connections">10000</limit>
+  <limit name="max_connections_per_user">100000</limit>
+  <limit name="max_pending_service_starts">10000</limit>
+  <limit name="max_names_per_connection">50000</limit>
+  <limit name="max_match_rules_per_connection">50000</limit>
+  <limit name="max_replies_per_connection">50000</limit>
+  <limit name="reply_timeout">300000</limit>
+
+</busconfig>
-- 
cgit v1.2.3


From dc5fbef86dc82fbc1d768dba489fe4ba0b09adfc Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Mon, 2 Nov 2009 11:21:20 -0600
Subject: Building a service file.

---
 tests/Makefile.am                        | 5 ++++-
 tests/service-manager-connect.service.in | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 tests/service-manager-connect.service.in

(limited to 'tests')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 744c807..3703259 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -137,6 +137,9 @@ DISTCLEANFILES += service-manager-no-connect-tester
 session.conf: session.conf.in Makefile.am
 	sed -e "s|\@servicedir\@|$(abspath $(builddir))|" $< > $@
 
+service-manager-connect.service: service-manager-connect.service.in Makefile.am
+	sed -e "s|\@builddir\@|$(abspath $(builddir))|" $< > $@
+
 service_manager_connect_SOURCES = \
 	service-manager-connect.c
 
@@ -159,7 +162,7 @@ service_manager_connect_service_LDADD = \
 	$(LIBINDICATOR_LIBS) \
 	$(top_builddir)/libindicator/.libs/libindicator.a
 
-service-manager-connect-tester: service-manager-connect service-manager-connect-service session.conf Makefile.am
+service-manager-connect-tester: service-manager-connect service-manager-connect-service session.conf service-manager-connect.service Makefile.am
 	@echo "#!/bin/sh" > service-manager-connect-tester
 	@echo dbus-test-runner --dbus-config $(builddir)/session.conf --task ./service-manager-connect >> service-manager-connect-tester
 	@chmod +x service-manager-connect-tester
diff --git a/tests/service-manager-connect.service.in b/tests/service-manager-connect.service.in
new file mode 100644
index 0000000..7d3da6b
--- /dev/null
+++ b/tests/service-manager-connect.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.ayatana.test
+Exec=@builddir@/service-manager-connect-service
-- 
cgit v1.2.3


From 5e5f49521da190319a54ee5a7d18f9b824823027 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Mon, 2 Nov 2009 11:24:03 -0600
Subject: Switching the name to match the service file... should fail.

---
 tests/service-manager-connect.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/service-manager-connect.c b/tests/service-manager-connect.c
index 1c32eb2..c7c9282 100644
--- a/tests/service-manager-connect.c
+++ b/tests/service-manager-connect.c
@@ -29,7 +29,7 @@ main (int argc, char ** argv)
 	g_type_init();
 	g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
 
-	IndicatorServiceManager * is = indicator_service_manager_new("my.test.name");
+	IndicatorServiceManager * is = indicator_service_manager_new("org.ayatana.test");
 	g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, connection, NULL);
 
 	g_timeout_add_seconds(1, timeout, NULL);
-- 
cgit v1.2.3


From 6cb18e9a371158977143c198d43e69c73895496d Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Mon, 2 Nov 2009 16:13:28 -0600
Subject: We want to not get the shutdown.  Since we're testing that we get it
 without connection we can now assume that if we don't get it we should pass.

---
 tests/service-manager-connect-service.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'tests')

diff --git a/tests/service-manager-connect-service.c b/tests/service-manager-connect-service.c
index 666739a..297f3ba 100644
--- a/tests/service-manager-connect-service.c
+++ b/tests/service-manager-connect-service.c
@@ -8,8 +8,8 @@ static gboolean passed = FALSE;
 gboolean
 timeout (gpointer data)
 {
-	passed = FALSE;
-	g_error("Timeout with no shutdown.");
+	passed = TRUE;
+	g_debug("Timeout with no shutdown.");
 	g_main_loop_quit(mainloop);
 	return FALSE;
 }
@@ -17,8 +17,8 @@ timeout (gpointer data)
 void
 shutdown (void)
 {
-	g_debug("Shutdown");
-	passed = TRUE;
+	g_error("Shutdown");
+	passed = FALSE;
 	g_main_loop_quit(mainloop);
 	return;
 }
@@ -28,7 +28,7 @@ main (int argc, char ** argv)
 {
 	g_type_init();
 
-	IndicatorService * is = indicator_service_new("my.test.name");
+	IndicatorService * is = indicator_service_new("org.ayatana.test");
 	g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_SIGNAL_SHUTDOWN, shutdown, NULL);
 
 	g_timeout_add_seconds(1, timeout, NULL);
-- 
cgit v1.2.3


From c3d30bd0cfd9f29072424f7a4c63bab7618d45fa Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Mon, 2 Nov 2009 16:14:53 -0600
Subject: We should pass the test if we get a connection, it means we
 activated.

---
 tests/service-manager-connect.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tests')

diff --git a/tests/service-manager-connect.c b/tests/service-manager-connect.c
index c7c9282..c252542 100644
--- a/tests/service-manager-connect.c
+++ b/tests/service-manager-connect.c
@@ -8,8 +8,8 @@ static gboolean passed = FALSE;
 gboolean
 timeout (gpointer data)
 {
-	passed = TRUE;
-	g_debug("Timeout with no connection.");
+	passed = FALSE;
+	g_error("Timeout with no connection.");
 	g_main_loop_quit(mainloop);
 	return FALSE;
 }
@@ -18,7 +18,7 @@ void
 connection (void)
 {
 	g_debug("Connection");
-	passed = FALSE;
+	passed = TRUE;
 	g_main_loop_quit(mainloop);
 	return;
 }
-- 
cgit v1.2.3


From 5ccc73bea6b75cc3a027f831bb60bfcf43714deb Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Mon, 2 Nov 2009 16:17:31 -0600
Subject: Distcheck fixes.  Looking for the files in the right place and making
 sure we clean up after ourselves.

---
 tests/Makefile.am | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tests')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3703259..7c306bc 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -134,10 +134,10 @@ DISTCLEANFILES += service-manager-no-connect-tester
 # Service Manager Connect
 #############################
 
-session.conf: session.conf.in Makefile.am
+session.conf: $(srcdir)/session.conf.in Makefile.am
 	sed -e "s|\@servicedir\@|$(abspath $(builddir))|" $< > $@
 
-service-manager-connect.service: service-manager-connect.service.in Makefile.am
+service-manager-connect.service: $(srcdir)/service-manager-connect.service.in Makefile.am
 	sed -e "s|\@builddir\@|$(abspath $(builddir))|" $< > $@
 
 service_manager_connect_SOURCES = \
@@ -168,7 +168,7 @@ service-manager-connect-tester: service-manager-connect service-manager-connect-
 	@chmod +x service-manager-connect-tester
 
 TESTS += service-manager-connect-tester
-DISTCLEANFILES += service-manager-connect-tester
+DISTCLEANFILES += service-manager-connect-tester session.conf service-manager-connect.service
 
 #############################
 # Test stuff
-- 
cgit v1.2.3