[med-svn] [pbgenomicconsensus] 07/08: Adjust test suite for new release

[Afif Elghraoui]

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

afif pushed a commit to branch master
in repository pbgenomicconsensus.

commit c73735bd6cd622889932565e1f3491dd83693708
Author: Afif Elghraoui <afif at debian.org>
Date:   Fri Jul 8 08:58:46 2016 -0700

    Adjust test suite for new release
---
 debian/patches/disable-arrow-tests.patch | 28 ++++++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 debian/rules                             |  2 ++
 3 files changed, 31 insertions(+)

diff --git a/debian/patches/disable-arrow-tests.patch b/debian/patches/disable-arrow-tests.patch
new file mode 100644
index 0000000..73c4d69
--- /dev/null
+++ b/debian/patches/disable-arrow-tests.patch
@@ -0,0 +1,28 @@
+Description: Disable tests for Arrow
+ These tests need ConsensusCore2, and the version currently packaged in
+ Debian is newer than this GenomicConsensus version and not compatible.
+ The tests are thus expected to fail in this situation.
+Author: Afif Elghraoui <afif at debian.org>
+Forwarded: not-needed
+Last-Update: 2016-07-08
+--- pbgenomicconsensus.orig/tests/unit/test_tool_contract.py
++++ pbgenomicconsensus/tests/unit/test_tool_contract.py
+@@ -36,6 +36,7 @@
+             self.assertTrue(isinstance(ds, ContigSet))
+ 
+ 
++ at unittest.skip("Compatible version of ConsensusCore2 isn't available")
+ class TestVariantCallerArrow(TestVariantCaller):
+     TASK_OPTIONS = {
+       "genomic_consensus.task_options.algorithm": "arrow",
+--- pbgenomicconsensus.orig/Makefile
++++ pbgenomicconsensus/Makefile
+@@ -15,7 +15,7 @@
+ 	# Unit tests
+ 	nosetests -v --with-xunit tests/unit
+ 	# End-to-end tests
+-	PATH=`pwd`:$(PATH) cram --verbose tests/cram/*.t
++	PATH=`pwd`:$(PATH) cram --verbose `ls tests/cram/*.t | grep -v -e arrow -e bad_input`
+ 
+ extra-tests:
+ 	# Tests that need to be run by Jenkins but are slowing
diff --git a/debian/patches/series b/debian/patches/series
index 0b14f63..264dbf0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 spelling.patch
 verbose-testing.patch
+disable-arrow-tests.patch
diff --git a/debian/rules b/debian/rules
index a89ca39..8cc36f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,9 @@ genomicconsensus.7.md \
 	dh $@ --with python2 --buildsystem=pybuild
 
 override_dh_auto_test:
+	chmod +x bin/gffToBed
 	PYTHONPATH=$(CURDIR) PATH=$(CURDIR)/bin:$$PATH $(MAKE) tests
+	chmod -x bin/gffToBed
 
 override_dh_auto_build: docs
 	dh_auto_build

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