mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-02-15 15:37:28 -08:00
7de54d8bb0
* Tests didn't work with recent versions of file. Provide patches that
have been merged upstream.
* Fix dependencies, DEPEND=${DEPEND} was a typo.
* EAPI=7.
Package-Manager: Portage-2.3.45, Repoman-2.3.10
Closes: https://github.com/gentoo/gentoo/pull/9607
50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
commit 4bda684f8b461cc1f69593799efcf6afe8397756
|
|
Author: Adam Hupp <adam@hupp.org>
|
|
Date: Sat Dec 9 09:09:00 2017 -0800
|
|
|
|
fix test for xenial since travis started enabling it
|
|
|
|
diff --git a/test/test.py b/test/test.py
|
|
index addccc6..c6e2d9c 100755
|
|
--- a/test/test.py
|
|
+++ b/test/test.py
|
|
@@ -17,7 +17,7 @@ class MagicTest(unittest.TestCase):
|
|
except TypeError:
|
|
filename = os.path.join(self.TESTDATA_DIR.encode('utf-8'), filename)
|
|
|
|
-
|
|
+
|
|
if type(expected_value) is not tuple:
|
|
expected_value = (expected_value,)
|
|
|
|
@@ -37,7 +37,7 @@ class MagicTest(unittest.TestCase):
|
|
self.assertEqual("text/x-python", m.from_buffer(s))
|
|
b = b'#!/usr/bin/env python\nprint("foo")'
|
|
self.assertEqual("text/x-python", m.from_buffer(b))
|
|
-
|
|
+
|
|
def test_mime_types(self):
|
|
dest = os.path.join(MagicTest.TESTDATA_DIR, b'\xce\xbb'.decode('utf-8'))
|
|
shutil.copyfile(os.path.join(MagicTest.TESTDATA_DIR, 'lambda'), dest)
|
|
@@ -92,9 +92,9 @@ class MagicTest(unittest.TestCase):
|
|
|
|
m = magic.Magic(mime=True)
|
|
self.assertEqual(m.from_file(filename), 'image/jpeg')
|
|
-
|
|
+
|
|
m = magic.Magic(mime=True, keep_going=True)
|
|
- self.assertEqual(m.from_file(filename), 'image/jpeg')
|
|
+ self.assertEqual(m.from_file(filename), 'image/jpeg\\012- application/octet-stream')
|
|
|
|
|
|
def test_rethrow(self):
|
|
@@ -103,7 +103,7 @@ class MagicTest(unittest.TestCase):
|
|
def t(x,y):
|
|
raise magic.MagicException("passthrough")
|
|
magic.magic_buffer = t
|
|
-
|
|
+
|
|
self.assertRaises(magic.MagicException, magic.from_buffer, "hello", True)
|
|
finally:
|
|
magic.magic_buffer = old
|