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.

---
 .bzrignore                              |  4 +++
 tests/Makefile.am                       | 41 +++++++++++++++++++++++++++-
 tests/service-manager-connect-service.c | 46 ++++++++++++++++++++++++++++++++
 tests/service-manager-connect.c         | 47 +++++++++++++++++++++++++++++++++
 tests/session.conf.in                   | 40 ++++++++++++++++++++++++++++
 5 files changed, 177 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

diff --git a/.bzrignore b/.bzrignore
index 8bbe474..c4038b4 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -126,3 +126,7 @@ tests/loader-tester
 tests/service-shutdown-timeout-tester
 tests/service-manager-no-connect
 tests/service-manager-no-connect-tester
+tests/service-manager-connect
+tests/service-manager-connect-service
+tests/service-manager-connect-tester
+tests/session.conf
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