This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository python-pysam.
commit cfeae8dc5d07407423e5a93a1995d5dedbc2e036 Author: Andreas Tille <ti...@debian.org> Date: Mon Sep 18 22:20:54 2017 +0200 Further patch from upstream should solve final test issue --- debian/changelog | 1 - ...linking-tests-only-when-explicitely-reque.patch | 2 +- ...o-prevent-it-from-being-picked-up-by-nose.patch | 39 ++++++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 41 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e5821f2..9d290ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,6 @@ python-pysam (0.12.0.1+ds-1) UNRELEASED; urgency=medium * Standards-Version: 4.1.0 (no changes needed) * Apply upstream patch to fix test suite Closes: #871083, #834856 - TODO: not fully solved, see upstream issue https://github.com/pysam-developers/pysam/issues/541 [ 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 index 9520111..185dfbd 100644 --- a/debian/patches/execute-linking-tests-only-when-explicitely-reque.patch +++ b/debian/patches/execute-linking-tests-only-when-explicitely-reque.patch @@ -1,7 +1,7 @@ From: Andreas Heger <andreas.he...@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 +Subject: execute linking tests only when explicitely requested via PYSAM_LINKING_TESTS env var. Keep on travis. Fixes #534 --- diff --git a/debian/patches/rename-helper-function-to-prevent-it-from-being-picked-up-by-nose.patch b/debian/patches/rename-helper-function-to-prevent-it-from-being-picked-up-by-nose.patch new file mode 100644 index 0000000..d96b801 --- /dev/null +++ b/debian/patches/rename-helper-function-to-prevent-it-from-being-picked-up-by-nose.patch @@ -0,0 +1,39 @@ +From: Andreas Heger <andreas.he...@gmail.com> +Date: Mon, 18 Sep 2017 16:48:21 +0100 +Bug-Debian: https://bugs.debian.org/871083 +Subject: rename helper function to prevent it from being picked + up by nose, fixes #541 + +--- + tests/linking_test.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/tests/linking_test.py ++++ b/tests/linking_test.py +@@ -20,7 +20,7 @@ def check_import(statement): + raise + + +-def check_tests_pass(statement): ++def check_pass(statement): + try: + output = subprocess.check_output( + statement, stderr=subprocess.STDOUT, shell=True) +@@ -55,7 +55,7 @@ class TestLinkWithRpath(TestLinking): + package_name = "link_with_rpath" + + def test_package_tests_pass(self): +- self.assertTrue(check_tests_pass( ++ self.assertTrue(check_pass( + "cd {} && python test_module.py".format(os.path.join(self.workdir, "tests")))) + + +@@ -79,7 +79,7 @@ class TestLinkWithoutRpath(TestLinking): + pysam_libdirs, pysam_libs = zip(*[os.path.split(x) for x in pysam_libraries]) + pysam_libdir = pysam_libdirs[0] + +- self.assertTrue(check_tests_pass( ++ self.assertTrue(check_pass( + "export LD_LIBRARY_PATH={}:$PATH && cd {} && python test_module.py".format( + pysam_libdir, + os.path.join(self.workdir, "tests")))) diff --git a/debian/patches/series b/debian/patches/series index f250698..155615b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ execute-linking-tests-only-when-explicitely-reque.patch +rename-helper-function-to-prevent-it-from-being-picked-up-by-nose.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-pysam.git _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit