Apply upstream patch to fix test suite

diff --git a/debian/changelog b/debian/changelog
index 709bb0d98334fbe7dc7465bd103dfde6f96f550a..a07960506cee31b59cc8cb80d617487feda12f42 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ python-pysam (0.12.0.1+ds-1) UNRELEASED; urgency=medium
   [ Andreas Tille ]
   * Drop patch applied upstream
   * Standards-Version: 4.1.0 (no changes needed)
+  * Apply upstream patch to fix test suite
+    Closes: #871083
 
   [ Afif Elghraoui ]
   * New upstream version

diff --git a/debian/patches/execute-linking-tests-only-when-explicitely-reque.patch b/debian/patches/execute-linking-tests-only-when-explicitely-reque.patch
new file mode 100644 (file)
index 0000000..9520111
--- /dev/null
+++ b/debian/patches/execute-linking-tests-only-when-explicitely-reque.patch
@@ -0,0 +1,66 @@
+From: Andreas Heger <andreas.heger@gmail.com>
+Date: Mon, 18 Sep 2017 11:19:28 +0100
+Bug-Debian: https://bugs.debian.org/871083
+Subject: {AH} execute linking tests only when explicitely
+ requested via PYSAM_LINKING_TESTS env var. Keep on travis. Fixes #534
+
+---
+ .travis.yml           |  2 ++
+ tests/TestUtils.py    |  1 +
+ tests/linking_test.py | 10 ++++++++++
+ 3 files changed, 13 insertions(+)
+
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -11,6 +11,8 @@ env:
+     - CONDA_PY=3.4
+     - CONDA_PY=3.5
+     - CONDA_PY=3.6
++  global:
++    - PYSAM_LINKING_TEST=1
+ 
+ addons:
+   apt:
+--- a/tests/TestUtils.py
++++ b/tests/TestUtils.py
+@@ -23,6 +23,7 @@ LINKDIR = os.path.abspath(os.path.join(o
+ 
+ IS_PYTHON3 = sys.version_info[0] >= 3
+ 
++
+ if IS_PYTHON3:
+     from itertools import zip_longest
+     from urllib.request import urlopen
+--- a/tests/linking_test.py
++++ b/tests/linking_test.py
+@@ -31,6 +31,9 @@ def check_tests_pass(statement):
+     return True
+ 
+ 
++@unittest.skipUnless(
++    os.environ.get("PYSAM_LINKING_TESTS", None),
++    "enable linking tests by setting PYSAM_LINKING_TESTS environment variable")
+ class TestLinking(unittest.TestCase):
+ 
+     package_name = "link_with_rpath"
+@@ -43,6 +46,10 @@ class TestLinking(unittest.TestCase):
+             "cd {} && rm -rf build && python setup.py install".format(self.workdir),
+                 shell=True)
+ 
++
++@unittest.skipUnless(
++    os.environ.get("PYSAM_LINKING_TESTS", None),
++    "enable linking tests by setting PYSAM_LINKING_TESTS environment variable")
+ class TestLinkWithRpath(TestLinking):
+ 
+     package_name = "link_with_rpath"
+@@ -52,6 +59,9 @@ class TestLinkWithRpath(TestLinking):
+             "cd {} && python test_module.py".format(os.path.join(self.workdir, "tests"))))
+ 
+ 
++@unittest.skipUnless(
++    os.environ.get("PYSAM_LINKING_TESTS", None),
++    "enable linking tests by setting PYSAM_LINKING_TESTS environment variable")
+ class TestLinkWithoutRpath(TestLinking):
+ 
+     package_name = "link_without_rpath"

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..f250698
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+execute-linking-tests-only-when-explicitely-reque.patch