Merge lp:~cyphermox/indicator-session/fix-tests into lp:indicator-session/13.04

[Mathieu Trudel-Lapierre]

Fix test -- disable TestCanStartService for the build; instead make it available via "make localcheck"; and move it to be run in an autopkgtest.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:383
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/46/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-ci/./build=pbuilder,distribution=raring,flavor=amd64/46/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-ci/./build=pbuilder,distribution=raring,flavor=i386/46/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/46//rebuild/?

review: Approve (continuous-integration)

[lp:~cyphermox/indicator-session/fix-tests]

384. By Mathieu Trudel-Lapierre on 2013-01-15

debian/control: temporarily comment out the XS-Testsuite entry to disable
autopkgtest until the tests really work properly.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:384
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/47/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-ci/./build=pbuilder,distribution=raring,flavor=amd64/47/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-ci/./build=pbuilder,distribution=raring,flavor=i386/47/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/47//rebuild/?

review: Approve (continuous-integration)

[lp:~cyphermox/indicator-session/fix-tests]

385. By Mathieu Trudel-Lapierre on 2013-01-16

Add comment in debian/tests/control for the reason why tests are disabled.

[Didier Roche-Tolomelli (didrocks)]

awesomeness! thanks :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:385
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/48/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-ci/./build=pbuilder,distribution=raring,flavor=amd64/48/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-ci/./build=pbuilder,distribution=raring,flavor=i386/48/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/48//rebuild/?

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-05 06:55:21 +0000
+++ debian/changelog	2013-01-16 19:06:22 +0000
@@ -14,6 +14,11 @@
     - 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,11 @@
     - 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.
+  * debian/control: temporarily comment out the XS-Testsuite entry to disable
+    autopkgtest until the tests really work properly.
 
   [ Sebastien Bacher ]
   * debian/control:

=== modified file 'debian/control'
--- debian/control	2012-11-30 16:24:17 +0000
+++ debian/control	2013-01-16 19:06:22 +0000
@@ -23,6 +23,7 @@
 # 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

=== added directory 'debian/tests'
=== added file 'debian/tests/control'
--- debian/tests/control	1970-01-01 00:00:00 +0000
+++ debian/tests/control	2013-01-16 19:06:22 +0000
@@ -0,0 +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
+Restrictions: build-needed

=== added file 'debian/tests/start-service'
--- debian/tests/start-service	1970-01-01 00:00:00 +0000
+++ debian/tests/start-service	2013-01-16 19:06:22 +0000
@@ -0,0 +1,21 @@
+#!/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
+

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2012-11-09 03:10:09 +0000
+++ tests/Makefile.am	2013-01-16 19:06:22 +0000
@@ -3,6 +3,9 @@
 BUILT_SOURCES =
 check_PROGRAMS =
 
+integrationcheckdir = .
+integrationcheck_PROGRAMS =
+
 ###
 ###
 ###
@@ -29,8 +32,10 @@
 	$(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --targetdir=. .
 
 
-TESTS += test-service
-check_PROGRAMS += test-service
+integrationcheck:
+	./test-service
+
+integrationcheck_PROGRAMS += test-service
 test_service_SOURCES = test-service.cc
 test_service_LDADD = \
 	$(TEST_SERVICE_LIBS) \