diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2014-10-09 13:27:36 +0000 |
|---|---|---|
| committer | CI bot <ps-jenkins@lists.canonical.com> | 2014-10-09 13:27:36 +0000 |
| commit | ebd9caea215ecf288ff267365258ca5f36f0ac21 (patch) | |
| tree | 81ea3dd71a9d158a5ca241148141639fef66ad91 | |
| parent | 65ce193dc6f4a1d5c67d3d86d7f7da2dd9471746 (diff) | |
| parent | 89cfe52564928abf51b7d122b81cee7967da8ea7 (diff) | |
| download | ayatana-indicator-session-ebd9caea215ecf288ff267365258ca5f36f0ac21.tar.gz ayatana-indicator-session-ebd9caea215ecf288ff267365258ca5f36f0ac21.tar.bz2 ayatana-indicator-session-ebd9caea215ecf288ff267365258ca5f36f0ac21.zip | |
Fix autopkg tests
Approved by: Charles Kerr, PS Jenkins bot
| -rw-r--r-- | debian/control | 5 | ||||
| -rw-r--r-- | debian/tests/control | 8 | ||||
| -rw-r--r-- | debian/tests/start-service | 21 |
3 files changed, 6 insertions, 28 deletions
diff --git a/debian/control b/debian/control index eb148bf..528175c 100644 --- a/debian/control +++ b/debian/control @@ -15,9 +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 -#XS-Testsuite: autopkgtest +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 Package: indicator-session Architecture: any 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 - |