Merge lp:~pitti/autopilot-gtk/test-improvements into lp:autopilot-gtk

[Martin Pitt]

* Respect DEB_BUILD_OPTIONS=nocheck.
* Add autopkgtest.
* Add missing at-spi2-core test dependency (caused tests to run 20 min instead of 40 s).

Fix DEB_BUILD_OPTIONS=nocheck and add autopkgtest.

The tests (both during package build and during autopkgtests) still take
awfully long (20 mins instead of 40 s) because of something that is missing in
those environments. I still need to track that down, but in the meantime these
tests work. I verified in sbuild (during package build, as they've run for
ages) and with run-adt-test.

[lp:~pitti/autopilot-gtk/test-improvements]

67. By Martin Pitt on 2013-12-18

Add at-spi2-core build/test dependency

The absence of this caused long D-BUS timeouts for starting applications, so
that our tests took 20 minutes instead of 40 seconds.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:66
http://jenkins.qa.ubuntu.com/job/autopilot-gtk-ci/75/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-gtk-trusty-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-gtk-trusty-armhf-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-gtk-trusty-i386-ci/10

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-gtk-ci/75/rebuild

review: Approve (continuous-integration)

[Allan LeSage (allanlesage)]

Tested build under both check and nocheck conditions, tests are snappy (~40 sec.) as reported.

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-11-06 11:11:53 +0000
+++ debian/control	2013-12-18 17:48:01 +0000
@@ -4,6 +4,7 @@
 XSBC-Original-Maintainer: Allan LeSage <[e-mail]>
 Build-Depends: autopilot-desktop (>= 1.4),
                bamfdaemon,
+               at-spi2-core,
                cmake,
                dbus-x11,
                debhelper (>= 9),
@@ -24,6 +25,7 @@
 # and sync up the code again.
 Vcs-Bzr: https://code.launchpad.net/~autopilot/autopilot-gtk/trunk
 Vcs-Browser: https://bazaar.launchpad.net/~autopilot/autopilot-gtk/trunk/files
+XS-Testsuite: autopkgtest
 
 Package: libautopilot-gtk
 Section: libs

=== modified file 'debian/rules'
--- debian/rules	2013-09-17 13:44:29 +0000
+++ debian/rules	2013-12-18 17:48:01 +0000
@@ -7,10 +7,12 @@
 	dh $@ 
 
 override_dh_auto_test:
+ifeq (, $(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 	mkdir -p debian/tmp/home/run
 	env HOME=$(CURDIR)/debian/tmp/home XDG_RUNTIME_DIR=$(CURDIR)/debian/tmp/home/run \
 		xvfb-run -a -e $(CURDIR)/debian/tmp/X.log dh_auto_test || \
 	        { echo "==== X.org log ===="; cat $(CURDIR)/debian/tmp/X.log; false; }
+endif
 
 override_dh_install:
 	dh_install --fail-missing

=== added directory 'debian/tests'
=== added file 'debian/tests/autopilot'
--- debian/tests/autopilot	1970-01-01 00:00:00 +0000
+++ debian/tests/autopilot	2013-12-18 17:48:01 +0000
@@ -0,0 +1,4 @@
+#!/bin/sh
+set -eu
+cd tests/autopilot
+autopilot-sandbox-run -a -v tests

=== added file 'debian/tests/control'
--- debian/tests/control	1970-01-01 00:00:00 +0000
+++ debian/tests/control	2013-12-18 17:48:01 +0000
@@ -0,0 +1,11 @@
+Tests: autopilot
+Depends: @,
+         autopilot-desktop (>= 1.4),
+         bamfdaemon,
+         at-spi2-core,
+         xvfb,
+         dbus-x11,
+         gnome-system-log,
+         gsettings-desktop-schemas,
+         python-gi,
+         gir1.2-gtk-3.0