Import upstream version 0.3.19

9 files changed, 79 insertions, 2 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f15309d..569055c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -18,7 +18,12 @@ lib_LTLIBRARIES = \
 DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf
 XVFB_RUN=". $(srcdir)/run-xvfb.sh"
 
-EXTRA_DIST = run-xvfb.sh
+EXTRA_DIST = \
+	run-xvfb.sh \
+	session.conf.in \
+	service-manager-connect.service.in \
+	service-version-bad.service.in \
+	service-version-good.service.in
 
 #############################
 # Test Loader
diff --git a/tests/Makefile.in b/tests/Makefile.in
index d77b4ac..10db723 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -452,7 +452,10 @@ lib_LTLIBRARIES = \
 
 DBUS_RUNNER = dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf
 XVFB_RUN = ". $(srcdir)/run-xvfb.sh"
-EXTRA_DIST = run-xvfb.sh test-well-formed.desktop
+EXTRA_DIST = run-xvfb.sh session.conf.in \
+	service-manager-connect.service.in \
+	service-version-bad.service.in service-version-good.service.in \
+	test-well-formed.desktop
 test_loader_SOURCES = \
 	test-loader.c
 
diff --git a/tests/dummy-indicator-null.c b/tests/dummy-indicator-null.c
index 767067d..169196c 100644
--- a/tests/dummy-indicator-null.c
+++ b/tests/dummy-indicator-null.c
@@ -46,6 +46,11 @@ get_menu (IndicatorObject * io)
 {
 	return NULL;
 }
+const gchar *
+get_accessible_desc (IndicatorObject * io)
+{
+	return NULL;
+}
 
 static void dummy_indicator_null_class_init (DummyIndicatorNullClass *klass);
 static void dummy_indicator_null_init       (DummyIndicatorNull *self);
@@ -67,6 +72,7 @@ dummy_indicator_null_class_init (DummyIndicatorNullClass *klass)
 	io_class->get_label = get_label;
 	io_class->get_image = get_icon;
 	io_class->get_menu = get_menu;
+	io_class->get_accessible_desc = get_accessible_desc;
 
 	return;
 }
diff --git a/tests/dummy-indicator-signaler.c b/tests/dummy-indicator-signaler.c
index 9bd01bf..dcb2560 100644
--- a/tests/dummy-indicator-signaler.c
+++ b/tests/dummy-indicator-signaler.c
@@ -50,6 +50,12 @@ get_menu (IndicatorObject * io)
 	return main_menu;
 }
 
+const gchar *
+get_accessible_desc (IndicatorObject * io)
+{
+	return "Signaler Item";
+}
+
 static void dummy_indicator_signaler_class_init (DummyIndicatorSignalerClass *klass);
 static void dummy_indicator_signaler_init       (DummyIndicatorSignaler *self);
 static void dummy_indicator_signaler_dispose    (GObject *object);
@@ -70,6 +76,7 @@ dummy_indicator_signaler_class_init (DummyIndicatorSignalerClass *klass)
 	io_class->get_label = get_label;
 	io_class->get_image = get_icon;
 	io_class->get_menu = get_menu;
+	io_class->get_accessible_desc = get_accessible_desc;
 
 	return;
 }
diff --git a/tests/dummy-indicator-simple.c b/tests/dummy-indicator-simple.c
index 654650f..70937ba 100644
--- a/tests/dummy-indicator-simple.c
+++ b/tests/dummy-indicator-simple.c
@@ -50,6 +50,12 @@ get_menu (IndicatorObject * io)
 	return main_menu;
 }
 
+const gchar *
+get_accessible_desc (IndicatorObject * io)
+{
+	return "Simple Item";
+}
+
 static void dummy_indicator_simple_class_init (DummyIndicatorSimpleClass *klass);
 static void dummy_indicator_simple_init       (DummyIndicatorSimple *self);
 static void dummy_indicator_simple_dispose    (GObject *object);
@@ -70,6 +76,7 @@ dummy_indicator_simple_class_init (DummyIndicatorSimpleClass *klass)
 	io_class->get_label = get_label;
 	io_class->get_image = get_icon;
 	io_class->get_menu = get_menu;
+	io_class->get_accessible_desc = get_accessible_desc;
 
 	return;
 }
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
diff --git a/tests/service-version-bad.service.in b/tests/service-version-bad.service.in
new file mode 100644
index 0000000..1e763eb
--- /dev/null
+++ b/tests/service-version-bad.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.ayatana.version.bad
+Exec=@builddir@/service-version-bad-service
diff --git a/tests/service-version-good.service.in b/tests/service-version-good.service.in
new file mode 100644
index 0000000..c57a04f
--- /dev/null
+++ b/tests/service-version-good.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.ayatana.version.good
+Exec=@builddir@/service-version-good-service
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>