Merge lp:~pitti/indicator-session/autopkgtest into lp:indicator-session/14.10

[Martin Pitt]

Fix autopkg tests

I noticed that https://jenkins.qa.ubuntu.com/job/utopic-adt-indicator-session/?
recently started to exist and fail. This is because current dpkg-source
automatically adds a "Testsuite: autopkgtest" header if there is a
debian/tests/control, and as that's broken the test fails.

We could of course just remove debian/tests/control (there's nothing valuable
in it), but I thought I'd give it a go. I didn't really find a true "system
level" test, as there is no such thing as "make integrationcheck" (perhaps it
existed long ago). I also tried with indicator-loader and

  dbus-send --print-reply --session --dest=com.canonical.indicator.session /com/canonical/indicator/session org.gtk.Actions.List

but that doesn't seem to work with indicator-loader, just under Unity.

So for now this updated test just calls the built test-service. It doesn't
actually test the installed package, but at least i-s' dependencies.

If you have a better idea how to test the actual package I'm all ears, of
course!

Thanks for considering!

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:459
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/146/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-utopic-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-utopic-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/indicator-session-utopic-armhf-ci/10/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-session-ci/146/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

I'd like to have charles comment on this some, but he's out today. I'm a bit surprised by the depends on the tests, it seems like we shouldn't need accountsservice or policykit for the test. Otherwise that seems like a good way to test the service to me.

[Charles Kerr (charlesk)]

The accountsservice dependency looks like a leftover from ~2011 when it was used to provide the user list.

Likewise, the polkit-1 dependency looks like a leftover from ~2009 when it was used to ask whether or not given actions could be performed. (However, see discussion in bug #474392).

Neither of these dependencies is new in this MP -- pitti's test is just a victim of pre-existing cruft and shouldn't block on it IMO.

I've opened a separate cleanup "remove unneeded dependencies" ticket @ bug #1378023

review: Approve

[Martin Pitt (pitti)]

Confirmed, I removed these two test dependencies and the test still succeeds. But as this MP is already being landed, I don't want to update this any more. Please let me know if you need to abort the landing for any reason, then I can just push the test dep update. Thanks!

=== modified file 'debian/control'
--- debian/control	2014-04-02 15:02:59 +0000
+++ debian/control	2014-09-23 10:05:42 +0000
@@ -15,9 +15,8 @@
 # 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

=== modified file 'debian/tests/control'
--- debian/tests/control	2013-01-16 19:03:59 +0000
+++ debian/tests/control	2014-09-23 10:05:42 +0000
@@ -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

=== removed file 'debian/tests/start-service'
--- debian/tests/start-service	2013-01-15 16:33:47 +0000
+++ debian/tests/start-service	1970-01-01 00:00:00 +0000
@@ -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
-