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 2382c5767e305c38c6937e1cb39a259db1b7407a Author: Afif Elghraoui <a...@ghraoui.name> Date: Sun Sep 20 00:09:58 2015 -0700 Do not rename the script in this patch renaming dataset.py to pbdataset will be done globally in a separate patch. --- debian/patches/series | 2 +- debian/patches/skip-integration-tests.patch | 21 +++++++++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/debian/patches/series b/debian/patches/series index 60fcab0..4cfcc9a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,3 @@ doc-theme.patch enable-build-time-testing.patch -skip-integration-tests +skip-integration-tests.patch diff --git a/debian/patches/skip-integration-tests.patch b/debian/patches/skip-integration-tests.patch index 2bdd648..d4f1f1f 100644 --- a/debian/patches/skip-integration-tests.patch +++ b/debian/patches/skip-integration-tests.patch @@ -17,21 +17,30 @@ Last-Update: 2015-09-19 import tempfile import numpy as np -@@ -79,6 +80,8 @@ +@@ -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(subprocess.call(["which", "pbdataset"]), -+ "pbdataset script is not available") ++ @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 +95,8 @@ +@@ -92,6 +97,8 @@ self.assertTrue(os.path.exists( os.path.join(outdir, os.path.basename(data.getXml(16))))) -+ @unittest.skipIf(subprocess.call(["which", "pbdataset"]), -+ "pbdataset script is not available") ++ @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 _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit