Fix test -- disable TestCanStartService for the build; instead make it available via "make localcheck"; and move it to be run in an autopkgtest.

Approved by PS Jenkins bot, Didier Roche.

5 files changed, 44 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index a9c9181..eb8acc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,11 @@ indicator-session (12.10.5-0ubuntu1) UNRELEASED; urgency=low
     - Remove libpackagekit-glib2-dev and libpolkit-gobject-1-dev
       from Build-Depends. (LP: #1085100)
     - Remove packagekit from Recommends
+    - Add XS-Testsuite: autopkgtest.
+  * debian/tests:
+    - Add start-service test; verify that the indicator can be started from
+      DBUS.
+    - Add debian/tests/control.
   * Automatic snapshot from revision 373 (bootstrap):
     - Check to make sure that create_display_proxy() succeeded before using the
       proxy pointer that gets returned. (LP: #1078119)
@@ -21,6 +26,11 @@ indicator-session (12.10.5-0ubuntu1) UNRELEASED; urgency=low
     - Hide 'start screen saver' action, if it's locked down. (LP: #1066825)
     - Use the same icons in the greeter as in the user session (LP: #1049244)
     - Test upower_proxy for NULL before using it. (LP: #1061844)
+  * Move TestCanStartService into a separate make target "localcheck"; so that
+    the other tests can successfully run, and this one be used as an
+    integration check.
+  * debian/control: temporarily comment out the XS-Testsuite entry to disable
+    autopkgtest until the tests really work properly.
 
   [ Sebastien Bacher ]
   * debian/control:
diff --git a/debian/control b/debian/control
index d910c9c..3131969 100644
--- a/debian/control
+++ b/debian/control
@@ -23,6 +23,7 @@ Homepage: https://launchpad.net/indicator-session
 # and sync up the code again.
 Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/indicator-session/trunk.13.04
 Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/indicator-session/trunk.13.04/files
+#XS-Testsuite: autopkgtest
 
 Package: indicator-session
 Architecture: any
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..008828a
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,5 @@
+#Tests: start-service
+# start-service currently disabled; it needs services running for it to pass
+# and that currently can't be setup properly in a buildd.
+Depends: python3-aptdaemon.test, policykit-1, accountsservice, consolekit, indicator-session
+Restrictions: build-needed
diff --git a/debian/tests/start-service b/debian/tests/start-service
new file mode 100644
index 0000000..3b81bbc
--- /dev/null
+++ b/debian/tests/start-service
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -x
+set -e
+
+if [ ! -d /var/run/dbus ]; then
+	mkdir /var/run/dbus
+fi
+
+dbus-daemon --fork --print-address=4 --config-file /etc/dbus-1/system.conf --print-pid=5 4>/tmp/system-bus-addr 5>/tmp/system-bus-pid
+dbus-daemon --fork --session --print-address=4 --config-file 4>/tmp/session-bus-addr
+
+DBUS_SYSTEM_BUS_ADDRESS=`cat /tmp/system-bus-addr`
+DBUS_SESSION_BUS_ADDRESS=`cat /tmp/session-bus-addr`
+
+/usr/lib/policykit-1/polkitd 2>&1 &
+/usr/sbin/console-kit-daemon &
+/usr/lib/accountsservice/accounts-daemon &
+
+make -C tests integrationcheck
+
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 088b283..c117c95 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,6 +3,9 @@ CLEANFILES =
 BUILT_SOURCES =
 check_PROGRAMS =
 
+integrationcheckdir = .
+integrationcheck_PROGRAMS =
+
 ###
 ###
 ###
@@ -29,8 +32,10 @@ gschemas.compiled: Makefile
 	$(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --targetdir=. .
 
 
-TESTS += test-service
-check_PROGRAMS += test-service
+integrationcheck:
+	./test-service
+
+integrationcheck_PROGRAMS += test-service
 test_service_SOURCES = test-service.cc
 test_service_LDADD = \
 	$(TEST_SERVICE_LIBS) \