Merge lp:~mvo/click/fix-adt-tests into lp:click/devel

[Michael Vogt]

Fix autopkgtests

This branch fixes the autopkgtest failure in 0.4.32

[lp:~mvo/click/fix-adt-tests]

517. By Michael Vogt on 2014-09-09

update changelog

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:517
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mvo/click/fix-adt-tests/+merge/233882/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/click-devel-ci/60/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-devel-utopic-amd64-ci/62
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-devel-utopic-armhf-ci/60
        deb: http://jenkins.qa.ubuntu.com/job/click-devel-utopic-armhf-ci/60/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-devel-utopic-i386-ci/60

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/click-devel-ci/60/rebuild

review: Needs Fixing (continuous-integration)

[Colin Watson (cjwatson)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:517
http://jenkins.qa.ubuntu.com/job/click-devel-ci/61/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-devel-utopic-amd64-ci/63
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-devel-utopic-armhf-ci/61
        deb: http://jenkins.qa.ubuntu.com/job/click-devel-utopic-armhf-ci/61/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-devel-utopic-i386-ci/61

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/click-devel-ci/61/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-05 16:42:12 +0000
+++ debian/changelog	2014-09-09 07:57:29 +0000
@@ -1,3 +1,9 @@
+click (0.4.32.1) UNRELEASED; urgency=low
+
+  * fix autopkgtest failure found in 0.4.32
+
+ -- Michael Vogt <[e-mail]>  Tue, 09 Sep 2014 09:56:57 +0200
+
 click (0.4.32) UNRELEASED; urgency=medium
 
   [ Daniel Holbach ]

=== modified file 'debian/tests/control'
--- debian/tests/control	2014-09-04 13:47:14 +0000
+++ debian/tests/control	2014-09-09 07:57:29 +0000
@@ -1,3 +1,3 @@
 Tests: run-tests.sh
-Depends: @, iputils-ping, click-dev, schroot, debootstrap, sudo, bzr, debsigs, debsig-verify, python3-six
+Depends: @, @builddeps@, iputils-ping, click-dev, schroot, debootstrap, sudo, bzr, debsigs, debsig-verify, python3-six
 Restrictions: needs-root allow-stderr

=== modified file 'debian/tests/run-tests.sh'
--- debian/tests/run-tests.sh	2014-07-08 13:34:06 +0000
+++ debian/tests/run-tests.sh	2014-09-09 07:57:29 +0000
@@ -2,4 +2,11 @@
 
 set -e
 
+# some files like config.py are generated from config.py.in
+./autogen.sh
+./configure --prefix=/usr \
+        --sysconfdir=/etc \
+        --with-systemdsystemunitdir=/lib/systemd/system \
+        --with-systemduserunitdir=/usr/lib/systemd/user
+
 TEST_INTEGRATION=1 python3 -m unittest discover -vv click.tests.integration