From d91c8f8a3f1d1d085d9feb6196a8c6fe609da1d2 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 23 Sep 2014 11:17:09 +0200 Subject: debian/control: Update Vcs-* links to current branch --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index eb148bf..8f0488c 100644 --- a/debian/control +++ b/debian/control @@ -15,8 +15,8 @@ Homepage: https://launchpad.net/indicator-session # If you aren't a member of ~indicator-applet-developers but need to upload # packaging changes, just go ahead. ~indicator-applet-developers will notice # 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 +Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/indicator-session/trunk.14.10 +Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/indicator-session/trunk.14.10/files #XS-Testsuite: autopkgtest Package: indicator-session -- cgit v1.2.3 From 7aa20458e166a4a503d6f7c306d24ca3d6279fd2 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 23 Sep 2014 11:20:13 +0200 Subject: debian/control: Drop commented out XS-Testsuite: field, dpkg now adds this automatically --- debian/control | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/control b/debian/control index 8f0488c..528175c 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,6 @@ Homepage: https://launchpad.net/indicator-session # and sync up the code again. Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/indicator-session/trunk.14.10 Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/indicator-session/trunk.14.10/files -#XS-Testsuite: autopkgtest Package: indicator-session Architecture: any -- cgit v1.2.3 From 89cfe52564928abf51b7d122b81cee7967da8ea7 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 23 Sep 2014 11:58:38 +0200 Subject: 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. --- debian/tests/control | 8 ++++---- debian/tests/start-service | 21 --------------------- 2 files changed, 4 insertions(+), 25 deletions(-) delete mode 100644 debian/tests/start-service 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 - -- cgit v1.2.3