now properly python version dependent test and hopefuly python-x.y-nose dependency...

diff --git a/debian/python-pysam-tests.docs b/debian/python-pysam-tests.docs
index 760739fe58663247665636e5edf1b0a34aba8f57..336cdc43865bc4a0c59881eb376cfe2ff40db3e9 100644 (file)
--- a/debian/python-pysam-tests.docs
+++ b/debian/python-pysam-tests.docs
@@ -1 +1 @@
-debian/tests/run-unit-test
+debian/python-tests/run-nose-tests

diff --git a/debian/python-tests/.#run-unit-test b/debian/python-tests/.#run-unit-test
new file mode 120000 (symlink)
index 0000000..3e0a2ee
--- /dev/null
+++ b/debian/python-tests/.#run-unit-test
@@ -0,0 +1 @@
+vagrant@debian.31577:1417164804
\ No newline at end of file

diff --git a/debian/python-tests/control b/debian/python-tests/control
new file mode 100644 (file)
index 0000000..faf5cfc
--- /dev/null
+++ b/debian/python-tests/control
@@ -0,0 +1,3 @@
+Tests: run-nose-tests
+Depends: @, python-nose, python-pysam-tests, samtools, make
+Restrictions: allow-stderr

diff --git a/debian/python-tests/run-nose-tests b/debian/python-tests/run-nose-tests
new file mode 100644 (file)
index 0000000..0d19351
--- /dev/null
+++ b/debian/python-tests/run-nose-tests
@@ -0,0 +1,8 @@
+#!/bin/sh -e
+
+if [ "$ADTTMP" = "" ] ; then
+  ADTTMP=`mktemp -d /tmp/python-pysam-test.XXXXXX`
+fi
+cd $ADTTMP
+cp -a /usr/share/doc/python-pysam/tests/* $ADTTMP
+nosetesrs --nocapture

diff --git a/debian/python3-pysam-tests.docs b/debian/python3-pysam-tests.docs
index 760739fe58663247665636e5edf1b0a34aba8f57..a3ed821d9c60125b26324144c9fc1bcae4c42ed8 100644 (file)
--- a/debian/python3-pysam-tests.docs
+++ b/debian/python3-pysam-tests.docs
@@ -1 +1 @@
-debian/tests/run-unit-test
+debian/python3-tests/run-nose3-tests

diff --git a/debian/python3-tests/control b/debian/python3-tests/control
index f1a4bf7a573aa2c6f6352aed3001399789929a3f..58d8e4f54c6197a312777114e184280b988813c4 100644 (file)
--- a/debian/python3-tests/control
+++ b/debian/python3-tests/control
@@ -1,3 +1,3 @@
-Tests: run-unit-test
-Depends: @, python-pysam-tests, samtools, make
+Tests: run-nose3-tests
+Depends: @, python3-nose, python3-pysam-tests, samtools, make
 Restrictions: allow-stderr

diff --git a/debian/python3-tests/run-nose3-tests b/debian/python3-tests/run-nose3-tests
new file mode 100644 (file)
index 0000000..e710ac5
--- /dev/null
+++ b/debian/python3-tests/run-nose3-tests
@@ -0,0 +1,8 @@
+#!/bin/sh -e
+
+if [ "$ADTTMP" = "" ] ; then
+  ADTTMP=`mktemp -d /tmp/python3-pysam-test.XXXXXX`
+fi
+cd $ADTTMP
+cp -a /usr/share/doc/python3-pysam/tests/* $ADTTMP
+nosetests3 --nocapture

diff --git a/debian/python3-tests/run-unit-test b/debian/python3-tests/run-unit-test
deleted file mode 100644 (file)
index 44e94b4..0000000
--- a/debian/python3-tests/run-unit-test
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh -e
-
-if [ "$ADTTMP" = "" ] ; then
-  ADTTMP=`mktemp -d /tmp/python-pysam-test.XXXXXX`
-fi
-cd $ADTTMP
-cp -a /usr/share/doc/python-pysam/tests/* $ADTTMP
-gunzip -r *.py.gz \
-        ex9_fail.bam.gz \
-        ex9_nofail.bam.gz \
-        example_empty_header.bam.gz \
-        issue100.bam.gz
-chmod u+x ./pysam_test_offline.py
-./pysam_test_offline.py