Merge lp:~jibel/ubuntu/raring/software-properties/lp-1153989 into lp:ubuntu/raring/software-properties

[Jean-Baptiste Lallement]

[Jean-Baptiste Lallement (jibel)]

This branch fixes autopkgtests. It uses setup.py instead of make to run the tests which has been dropped in software-properties (0.92.14)

The following dep8 test dependencies have also been add:
python-distutils-extra
python-setuptools
python3-distutils-extra
python3-setuptools

[Colin Watson (cjwatson)]

Sorry, I fixed this independently before noticing your branch. I think my fix is a bit better, though, as it runs the tests under both Python 2 and 3.

review: Disapprove

Unmerged revisions

115. By Jean-Baptiste Lallement on 2013-03-12

debian/tests/run-tests: Use setup.py instead of make to run the tests and adds required test dependencies (LP: #1153989)

=== modified file 'debian/tests/control'
--- debian/tests/control	2012-10-29 13:51:14 +0000
+++ debian/tests/control	2013-03-12 10:18:16 +0000
@@ -1,2 +1,4 @@
 Tests: run-tests
-Depends: @, xvfb, python-dbus, python-pycurl, python3-pycurl, python-mock, python3-mock
+Depends: @, xvfb, python-dbus, python-pycurl, python3-pycurl, python-mock,
+    python3-mock, python-setuptools, python3-setuptools,
+    python-distutils-extra, python3-distutils-extra

=== modified file 'debian/tests/run-tests'
--- debian/tests/run-tests	2012-09-10 09:51:29 +0000
+++ debian/tests/run-tests	2013-03-12 10:18:16 +0000
@@ -2,6 +2,5 @@
 
 set -e
 
-cd tests
-xvfb-run make
+xvfb-run ./setup.py test