[med-svn] [python-pbcore] 01/03: Drop patch to skip integration tests at build time

[Afif Elghraoui]

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

afif-guest pushed a commit to branch master
in repository python-pbcore.

commit 2486e2d517b64d6177f1ffceda104303da2a5af1
Author: Afif Elghraoui <afif at ghraoui.name>
Date:   Mon Oct 26 21:22:05 2015 -0700

    Drop patch to skip integration tests at build time
    
    Upstream has applied a similar patch and mine is no longer
    necessary.
---
 debian/patches/series                       |  1 -
 debian/patches/skip-integration-tests.patch | 46 -----------------------------
 2 files changed, 47 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 99e9723..8944739 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 doc-theme.patch
 enable-build-time-testing.patch
-skip-integration-tests.patch
 rename-datasetpy.patch
diff --git a/debian/patches/skip-integration-tests.patch b/debian/patches/skip-integration-tests.patch
deleted file mode 100644
index d4f1f1f..0000000
--- a/debian/patches/skip-integration-tests.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Description: Check if scripts are installed and skip some tests if not
- When running tests at build time, two tests fail (supposedly because
- the a necessary script can't be found on the system PATH, but I added that
- and it still didn't work at build time). This patch will skip these two
- tests if the script cannot be found. That should skip the tests at build
- time and run them during CI.
-Author: Afif Elghraoui <afif at ghraoui.name>
-Bug: https://github.com/PacificBiosciences/pbcore/issues/21
-Last-Update: 2015-09-19
---- python-pbcore.orig/tests/test_pbdataset.py
-+++ python-pbcore/tests/test_pbdataset.py
-@@ -3,6 +3,7 @@
- import re
- import logging
- import itertools
-+import subprocess
- import tempfile
- 
- import numpy as np
-@@ -21,6 +22,8 @@
- 
- log = logging.getLogger(__name__)
- 
-+datasetpy_not_available = subprocess.call(["which", "dataset.py"])
-+
- class TestDataSet(unittest.TestCase):
-     """Unit and integrationt tests for the DataSet class and \
-     associated module functions"""
-@@ -79,6 +82,8 @@
-             ds.externalResources[-1].indices[0].resourceId ==
-             "IdontExist.bam.pbi")
- 
-+    @unittest.skipIf(datasetpy_not_available,
-+                    "pbdataset script is not available")
-     def test_split_cli(self):
-         outdir = tempfile.mkdtemp(suffix="dataset-unittest")
-         cmd = "dataset.py split --outdir {o} --contigs --chunks 2 {d}".format(
-@@ -92,6 +97,8 @@
-         self.assertTrue(os.path.exists(
-             os.path.join(outdir, os.path.basename(data.getXml(16)))))
- 
-+    @unittest.skipIf(datasetpy_not_available,
-+                    "pbdataset script is not available")
-     def test_create_cli(self):
-         log.debug("Absolute")
-         outdir = tempfile.mkdtemp(suffix="dataset-unittest")

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