[Python-modules-commits] [python-urllib3] 15/15: Use pytest for unit tests (same as upstream) and skip timing tests

[Ondrej Novy]

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

onovy pushed a commit to branch master
in repository python-urllib3.

commit b765bc390676779511392094325a0e215fa7585a
Author: Ondřej Nový <onovy at debian.org>
Date:   Mon Dec 11 23:11:20 2017 +0100

    Use pytest for unit tests (same as upstream) and skip timing tests
---
 debian/changelog |  1 +
 debian/rules     | 15 ++++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5f3dfcc..f8f39f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ python-urllib3 (1.22-1) UNRELEASED; urgency=medium
   * Bump debhelper compat level to 10
   * Standards-Version is 4.1.2 now (no changes needed)
   * Add python{3,}-pytest to B-D
+  * Use pytest for unit tests (same as upstream) and skip timing tests
 
  -- Ondřej Nový <onovy at debian.org>  Mon, 11 Dec 2017 21:22:20 +0100
 
diff --git a/debian/rules b/debian/rules
index 4574eac..212d80f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,14 @@
 
 export PYBUILD_NAME=urllib3
 export PYTHONWARNINGS=d
+export PYBUILD_TEST_PYTEST=1
+export PYBUILD_TEST_ARGS=\
+	--ignore=test/appengine \
+	--ignore=test/with_dummyserver \
+	--ignore=test/test_connectionpool.py \
+	--ignore=test/contrib/test_socks.py
+# Skip timing tests
+export TRAVIS_CI=1
 
 %:
 	dh $@ --with python2,python3 --buildsystem=pybuild
@@ -9,12 +17,5 @@ export PYTHONWARNINGS=d
 override_dh_auto_configure:
 	rm -f urllib3/packages/six.py
 
-override_dh_auto_test:
-	PYBUILD_SYSTEM=custom \
-	PYBUILD_TEST_ARGS="cd {build_dir}; {interpreter} -m nose {dir}/test --with-coverage -e with_dummyserver -e socks --ignore-files=\"test_gae_manager\.py\"" dh_auto_test
-	# Clean here .coverage because it is created by nose using the coverage
-	# plugin
-	find . -name .coverage -delete
-
 override_dh_installchangelogs:
 	dh_installchangelogs CHANGES.rst

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