From 77b8cbea6ceffecb4cbc471d1e8fa22843389439 Mon Sep 17 00:00:00 2001 From: Adam Hupp Date: Fri, 6 Nov 2020 10:39:10 -0800 Subject: Handle libmagic versions that don't support MAGIC_EXTENSION extension support was added to libmagic in 2015 in 9190a18d09f25fb0ca6abe1fcbdba780f5077e45. This change: - updates the test to handle various verions that return garbage / empty string.s - throws an exception in magic.Magic if extension support is requested and we know its not supported. --- test/test.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'test') diff --git a/test/test.py b/test/test.py index 15a4115..eb5af89 100755 --- a/test/test.py +++ b/test/test.py @@ -112,11 +112,16 @@ class MagicTest(unittest.TestCase): del os.environ['TZ'] def test_extension(self): - m = magic.Magic(extension=True) - self.assert_values(m, { - 'test.gz': 'gz/tgz/tpz/zabw/svgz', - 'name_use.jpg': 'jpeg/jpg/jpe/jfif', - }) + try: + m = magic.Magic(extension=True) + self.assert_values(m, { + # some versions return '' for the extensions of a gz file, + # including w/ the command line. Who knows... + 'test.gz': ('gz/tgz/tpz/zabw/svgz', '', '???'), + 'name_use.jpg': 'jpeg/jpg/jpe/jfif', + }) + except NotImplementedError: + self.skipTest('MAGIC_EXTENSION not supported in this version') def test_unicode_result_nonraw(self): m = magic.Magic(raw=False) -- cgit v1.2.1