aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--debian/changelog8
-rw-r--r--debian/control1
-rw-r--r--debian/tests/control3
-rw-r--r--debian/tests/start-service12
-rw-r--r--tests/Makefile.am9
6 files changed, 33 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 8fb5d77..a406d44 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,4 +40,6 @@ dist-hook:
echo Failed to generate AUTHORS: not a branch >&2; \
fi
+localcheck:
+
include $(top_srcdir)/Makefile.am.coverage
diff --git a/debian/changelog b/debian/changelog
index a9c9181..882d64a 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,9 @@ 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.
[ Sebastien Bacher ]
* debian/control:
diff --git a/debian/control b/debian/control
index d910c9c..0432587 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..e24f71b
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,3 @@
+Tests: start-service
+Depends: python3-aptdaemon.test, 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..1aeef94
--- /dev/null
+++ b/debian/tests/start-service
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+dbus-daemon --fork --print-address=4 --config-file /usr/share/aptdaemon/tests/dbus.conf --print-pid=5 4>/tmp/bus-addr 5>/tmp/pid-bus
+
+DBUS_SYSTEM_BUS_ADDRESS=`cat /tmp/bus-addr`
+
+/usr/sbin/console-kit-daemon &
+
+/usr/lib/accountsservice/accounts-daemon &
+
+tests/test-service
+
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 088b283..9f9f961 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,6 +3,9 @@ CLEANFILES =
BUILT_SOURCES =
check_PROGRAMS =
+localcheckdir = .
+localcheck_PROGRAMS =
+
###
###
###
@@ -29,8 +32,10 @@ gschemas.compiled: Makefile
$(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --targetdir=. .
-TESTS += test-service
-check_PROGRAMS += test-service
+localcheck:
+ ./test-service
+
+localcheck_PROGRAMS += test-service
test_service_SOURCES = test-service.cc
test_service_LDADD = \
$(TEST_SERVICE_LIBS) \