Patch applied upstream

diff --git a/debian/patches/no-usage-test-without-tty.patch b/debian/patches/no-usage-test-without-tty.patch
deleted file mode 100644 (file)
index 1f95b29..0000000
--- a/debian/patches/no-usage-test-without-tty.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: skip usage() tests on autobuilders
- The usage() functions check whether stdin is a tty before displaying usage
- information.  Therefore, we should not test this code when running on an
- autobuilder without a tty.
- .
- Clever allocation of a pty from within the test suite itself for purposes
- of testing this path is left as an exercise for the reader.
-Author: Steve Langasek <steve.langasek@canonical.com>
-
---- a/tests/samtools_test.py
-+++ b/tests/samtools_test.py
-@@ -245,6 +245,7 @@ class SamtoolsTest(unittest.TestCase):
-             self.check_statement(statement)
- 
-     @unittest.skipIf(sys.platform == "darwin", "not supported, pattern does not match")
-+    @unittest.skipIf(not sys.stdin.isatty(), "skipping usage tests, stdin is not a tty")
-     def testUsage(self):
-         if self.executable == "bcftools":
-             # bcftools usage messages end with exit(1)

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644 (file)
index 27db99f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-no-usage-test-without-tty.patch