[med-svn] [falcon] 11/15: Update unit test invocation

[Afif Elghraoui]

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

afif pushed a commit to branch master
in repository falcon.

commit c881a01f262bb0209217ed6d2ea02f2414c39931
Author: Afif Elghraoui <afif at debian.org>
Date:   Sat Dec 16 02:21:35 2017 -0500

    Update unit test invocation
    
    They are primarily based on pytest, but they still import
    from nose.tools, so we can't drop python-nose.
---
 debian/control       | 1 +
 debian/rules         | 2 +-
 debian/tests/control | 9 ++++++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 8e12c6d..b8eafdd 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Build-Depends:
 	python-networkx (>= 1.7),
 # Test-Depends:
 	python-nose,
+	python-pytest,
 Standards-Version: 3.9.8
 Homepage: https://github.com/PacificBiosciences/FALCON
 Vcs-Git: https://anonscm.debian.org/git/debian-med/falcon.git
diff --git a/debian/rules b/debian/rules
index a69df7a..9a2841b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ override_dh_auto_test: unit-tests ;
 
 .PHONY: unit-tests
 unit-tests:
-	nosetests -v FALCON/test/
+	$(MAKE) -C FALCON test
 
 .PHONY: integration-tests
 integration-tests:
diff --git a/debian/tests/control b/debian/tests/control
index 22ed87c..ea81077 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,9 +1,12 @@
 Test-Command:
 	export PYTHONPATH=/usr/lib/falcon/pylib;
-	cp -r FALCON/test FALCON/test_data $AUTOPKGTEST_TMP
+	cp -r FALCON/makefile FALCON/test FALCON/test_data $AUTOPKGTEST_TMP
+	# needed for doc-test...
+	&& mkdir $AUTOPKGTEST_TMP/falcon_kit
+	&& cp FALCON/falcon_kit/functional.py $AUTOPKGTEST_TMP/falcon_kit/
 	&& cd $AUTOPKGTEST_TMP
-	&& nosetests -v test/
-Depends: @, python-nose
+	&& make test
+Depends: @, make, python-nose, python-pytest
 Restrictions: allow-stderr
 
 Test-Command:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/falcon.git