[Python-modules-commits] [python-qtpy] 02/05: Update packaging to run the new upstream testsuite.

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository python-qtpy.

commit 957757dde646da602f7df8b99ba897f912aaecb0
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Fri Jul 8 11:20:19 2016 +0100

    Update packaging to run the new upstream testsuite.
---
 debian/control       |  6 +++++-
 debian/rules         |  8 ++------
 debian/tests/control | 10 ++++------
 debian/tests/python2 | 12 ------------
 debian/tests/python3 | 12 ------------
 5 files changed, 11 insertions(+), 37 deletions(-)

diff --git a/debian/control b/debian/control
index 028fb41..e629b2d 100644
--- a/debian/control
+++ b/debian/control
@@ -10,12 +10,16 @@ Build-Depends: debhelper (>= 9),
                python-pyqt5,
                python-pyqt5.qtsvg,
                python-pyqt5.qtwebkit,
+               python-pytest,
                python-setuptools,
                python3-all,
                python3-pyqt5,
                python3-pyqt5.qtsvg,
                python3-pyqt5.qtwebkit,
-               python3-setuptools
+               python3-pytest,
+               python3-setuptools,
+               xauth,
+               xvfb
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/python-qtpy.git
 Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/python-qtpy.git
diff --git a/debian/rules b/debian/rules
index f70b3a8..ad91b61 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,14 +3,10 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export PYBUILD_NAME = qtpy
+export PYBUILD_NAME=qtpy
 
 %:
 	dh $@ --with python2,python3 --buildsystem=pybuild
 
 override_dh_auto_test:
-	PYBUILD_SYSTEM=custom \
-	PYBUILD_BEFORE_TEST="cp {dir}/tests/tests.py {build_dir}" \
-	PYBUILD_TEST_ARGS="cd {build_dir}; {interpreter} tests.py" \
-	PYBUILD_AFTER_TEST="rm {build_dir}/tests.py" \
-	USE_QT_API=pyqt5 dh_auto_test
+	xvfb-run dh_auto_test
diff --git a/debian/tests/control b/debian/tests/control
index fd29268..c79899e 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,7 +1,5 @@
-Tests: python2
-Depends: python-all,
-         python-qtpy
+Test-Command: cp -a ./tests $AUTOPKGTEST_TMP ; cd $AUTOPKGTEST_TMP ; xvfb-run py.test
+Depends: python-qtpy, python-pytest, xauth, xvfb
 
-Tests: python3
-Depends: python3-all,
-         python3-qtpy
+Test-Command: cp -a ./tests $AUTOPKGTEST_TMP ; cd $AUTOPKGTEST_TMP ; xvfb-run py.test-3
+Depends: python3-qtpy, python3-pytest, xauth, xvfb
diff --git a/debian/tests/python2 b/debian/tests/python2
deleted file mode 100755
index 2101b3e..0000000
--- a/debian/tests/python2
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-set -efu
-
-pys="$(pyversions -r 2>/dev/null)"
-
-cp ./tests/tests.py "$ADTTMP"
-cd "$ADTTMP"
-
-for py in $pys; do
-	echo "=== $py ==="
-	USE_QT_API=pyqt5 $py tests.py 2>&1
-done
diff --git a/debian/tests/python3 b/debian/tests/python3
deleted file mode 100755
index 3afbf3c..0000000
--- a/debian/tests/python3
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-set -efu
-
-pys="$(py3versions -r 2>/dev/null)"
-
-cp ./tests/tests.py "$ADTTMP"
-cd "$ADTTMP"
-
-for py in $pys; do
-	echo "=== $py ==="
-	USE_QT_API=pyqt5 $py tests.py 2>&1
-done

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-qtpy.git