Restore old patch since the attempt to exclude tests more easily failed

diff --git a/debian/patches/exclude_tests_accessing_remote_http.patch b/debian/patches/exclude_tests_accessing_remote_http.patch
index 09c25ec881c7842fe4c5642f9ffcac6fe7a92f0e..6f5fa652d628634bf3e39f23e3cd51deb428243c 100644 (file)
--- a/debian/patches/exclude_tests_accessing_remote_http.patch
+++ b/debian/patches/exclude_tests_accessing_remote_http.patch
@@ -154,3 +154,72 @@ Description: Exclude tests trying to access remote http sites and thus need
  class TestLargeOptValues(unittest.TestCase):
  
      ints = (65536, 214748, 2147484, 2147483647)
+--- a/tests/tabix_test.py
++++ b/tests/tabix_test.py
+@@ -1039,66 +1039,6 @@ for vcf_file in vcf_files:
+     globals()[n] = type(n, (TestVCFFromVariantFile,), dict(filename=vcf_file,))
+ 
+ 
+-class TestRemoteFileHTTP(unittest.TestCase):
+-
+-    url = "http://genserv.anat.ox.ac.uk/downloads/pysam/test/example.gtf.gz"
+-    region = "chr1:1-1000"
+-    local = os.path.join(TABIX_DATADIR, "example.gtf.gz")
+-
+-    def setUp(self):
+-        if not pysam.config.HAVE_LIBCURL or not checkURL(self.url):
+-            self.remote_file = None
+-        else:
+-            self.remote_file = pysam.TabixFile(self.url, "r")
+-
+-        self.local_file = pysam.TabixFile(self.local, "r")
+-
+-    def tearDown(self):
+-        if self.remote_file is None:
+-            return
+-
+-        self.remote_file.close()
+-        self.local_file.close()
+-
+-    def testFetchAll(self):
+-        if self.remote_file is None:
+-            return
+-
+-        remote_result = list(self.remote_file.fetch())
+-        local_result = list(self.local_file.fetch())
+-
+-        self.assertEqual(len(remote_result), len(local_result))
+-        for x, y in zip(remote_result, local_result):
+-            self.assertEqual(x, y)
+-
+-    def testHeader(self):
+-        if self.remote_file is None:
+-            return
+-
+-        self.assertEqual(list(self.local_file.header), [])
+-
+-
+-class TestRemoteFileHTTPWithHeader(TestRemoteFileHTTP):
+-
+-    url = "http://genserv.anat.ox.ac.uk/downloads/pysam/test/example_comments.gtf.gz"
+-    region = "chr1:1-1000"
+-    local = os.path.join(TABIX_DATADIR, "example_comments.gtf.gz")
+-
+-    def setUp(self):
+-        if not pysam.config.HAVE_LIBCURL or not checkURL(self.url):
+-            self.remote_file = None
+-        else:
+-            self.remote_file = pysam.TabixFile(self.url, "r")
+-        self.local_file = pysam.TabixFile(self.local, "r")
+-
+-    def testHeader(self):
+-        if self.remote_file is None:
+-            return
+-
+-        self.assertEqual(list(self.local_file.header), ["# comment at start"])
+-        self.assertEqual(list(self.local_file.header), self.remote_file.header)
+-
+-
+ class TestIndexArgument(unittest.TestCase):
+ 
+     filename_src = os.path.join(TABIX_DATADIR, "example.vcf.gz")

diff --git a/debian/rules b/debian/rules
index 3337a82256e5c5e867accd0a17d9b42160191495..1d9410d00fb5da25d5cec469778f809f05a516f7 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -15,8 +15,9 @@ HTSLIBDIR  := /usr/lib/$(DEB_HOST_MULTIARCH)
 export HTSLIB_LIBRARY_DIR=$(HTSLIBDIR)
 export HTSLIB_INCLUDE_DIR=/usr/include
 
-export PYBUILD_TEST_ARGS_python2=-k-XTestRemoteFileHTTP -k-XTestRemoteFileHTTPWithHeader
-export PYBUILD_TEST_ARGS_python3=-k-XTestRemoteFileHTTP -k-XTestRemoteFileHTTPWithHeader
+# unfortunately this does not work - any hint to fix this would be really welcome
+#export PYBUILD_TEST_ARGS_python2=-k-XTestRemoteFileHTTP -k-XTestRemoteFileHTTPWithHeader
+#export PYBUILD_TEST_ARGS_python3=-k-XTestRemoteFileHTTP -k-XTestRemoteFileHTTPWithHeader
 
 clean: clean-tests
 %: