[PATCH 6/6] Use the Setuptools script for DEP-8 autopkg tests.

[Ben Finney]

---
 debian/changelog            | 1 +
 debian/tests/control        | 2 --
 debian/tests/python-debian  | 8 ++++----
 debian/tests/python3-debian | 8 ++++----
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 882c9205..2c33e5a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ python-debian (0.1.30) UNRELEASED; urgency=medium
   * Use the Setuptools script for Debian build-time test.
     Remove ‘python-nose’ dependency, no longer needed.
     Closes: bug#851324.
+  * Use the Setuptools script for DEP-8 autopkg tests.
 
  --
 
diff --git a/debian/tests/control b/debian/tests/control
index 0e60b62b..807ab508 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -3,7 +3,6 @@ Restrictions: allow-stderr needs-recommends
 Depends:
  binutils (>= 2.23),
  python3-all,
- python3-nose,
  python3-debian,
  debian-keyring,
  debian-archive-keyring
@@ -13,7 +12,6 @@ Restrictions: allow-stderr needs-recommends
 Depends:
  binutils (>= 2.23),
  python2.7,
- python-nose,
  python-debian,
  debian-keyring,
  debian-archive-keyring
diff --git a/debian/tests/python-debian b/debian/tests/python-debian
index 1a2dfa4f..85e267a0 100755
--- a/debian/tests/python-debian
+++ b/debian/tests/python-debian
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e -u -x
 cp -r tests/ "$ADTTMP"
-cd "$ADTTMP/tests/"
+cd "$ADTTMP"/
 export PYTHONWARNINGS=d
-# test suite requires python2.7
-LC_ALL=C python2.7 /usr/bin/nosetests --verbose --exe
-LC_ALL=C.UTF-8 python2.7 /usr/bin/nosetests --verbose --exe
+# Test suite requires Python 2.7.
+LC_ALL=C python2.7 ./setup.py test
+LC_ALL=C.UTF-8 python2.7 ./setup.py test
diff --git a/debian/tests/python3-debian b/debian/tests/python3-debian
index 607ad17f..3bffa5a4 100755
--- a/debian/tests/python3-debian
+++ b/debian/tests/python3-debian
@@ -1,10 +1,10 @@
 #!/bin/sh
 set -e -u -x
 cp -r tests/ "$ADTTMP"
-cd "$ADTTMP/tests/"
+cd "$ADTTMP"/
 export PYTHONWARNINGS=d
 for py in $(py3versions -i); do
-  # text mode file opening is locale dependent so try both ASCII and UTF-8
-  LC_ALL=C $py /usr/bin/nosetests3 --verbose --exe
-  LC_ALL=C.UTF-8 $py /usr/bin/nosetests3 --verbose --exe
+  # Text-mode file opening is locale-dependent, so try both ASCII and UTF-8.
+  LC_ALL=C $py ./setup.py test
+  LC_ALL=C.UTF-8 $py ./setup.py test
 done
-- 
2.11.0