aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@canonical.com>2014-09-23 11:58:38 +0200
committerMartin Pitt <martin.pitt@canonical.com>2014-09-23 11:58:38 +0200
commit89cfe52564928abf51b7d122b81cee7967da8ea7 (patch)
tree81ea3dd71a9d158a5ca241148141639fef66ad91 /debian
parent7aa20458e166a4a503d6f7c306d24ca3d6279fd2 (diff)
downloadayatana-indicator-session-89cfe52564928abf51b7d122b81cee7967da8ea7.tar.gz
ayatana-indicator-session-89cfe52564928abf51b7d122b81cee7967da8ea7.tar.bz2
ayatana-indicator-session-89cfe52564928abf51b7d122b81cee7967da8ea7.zip
Run tests-service as autopkgtest
Drop the obsolete and rather unnecessary setup from start-service (this is a system integration test, stuff shoudl just run after installation or get dbus activated). In lieu of an actual integration test that uses the installed package, run test-service. This won't check the installed indicator-session package, but at least verify that it still builds and runs, thus find regressions in the dependencies.
Diffstat (limited to 'debian')
-rw-r--r--debian/tests/control8
-rw-r--r--debian/tests/start-service21
2 files changed, 4 insertions, 25 deletions
diff --git a/debian/tests/control b/debian/tests/control
index 008828a..e5322df 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +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
+Test-Command: obj-*/tests/test-service
+Depends: indicator-session,
+ policykit-1,
+ accountsservice
Restrictions: build-needed
diff --git a/debian/tests/start-service b/debian/tests/start-service
deleted file mode 100644
index 3b81bbc..0000000
--- a/debian/tests/start-service
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/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
-