[fiona] 09/09: Fix tests

[Johan Van de Wauw]

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

johanvdw-guest pushed a commit to branch master
in repository fiona.

commit 89c0526a8df88d704a2bee1e479b38442580f604
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Wed Feb 4 20:07:39 2015 +0100

    Fix tests
---
 debian/control | 2 --
 debian/rules   | 9 ++++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index f633ef3..70c8e15 100644
--- a/debian/control
+++ b/debian/control
@@ -21,8 +21,6 @@ Build-Depends: debhelper (>= 9),
                python-sphinx,
                python-six,
                python3-six,
-               python-pytest,
-               python3-pytest,
 Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/fiona.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/fiona.git
diff --git a/debian/rules b/debian/rules
index e5a145b..8658d66 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,11 @@
 #!/usr/bin/make -f
 
 export PYBUILD_NAME=fiona
-
-export PYBUILD_TEST_PYTEST=1
-#test_cli are disabled because they test the tool after installation
-export PYBUILD_BEFORE_TEST = mv {dir}/tests/test_cli.py {dir}/tests/test_cli.py.disabled
-export PYBUILD_AFTER_TEST = mv {dir}/tests/test_cli.py.disabled {dir}/tests/test_cli.py
 export PYBUILD_AFTER_BUILD_python2 = PYTHONPATH={build_dir} http_proxy='127.0.0.1:9' sphinx-build -N -bhtml docs/ build/html 
+export PYBUILD_TEST_NOSE=1
+export PYBUILD_BEFORE_TEST=cp -r {dir}/tests {build_dir}
+export PYBUILD_AFTER_TEST=rm -rf {build_dir}/tests
+export PYBUILD_TEST_ARGS=--exclude test_geopackage --exclude fiona
 
 %:
 	dh  $@ --with python2,python3,sphinxdoc --buildsystem pybuild

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/fiona.git