From be4cef70da48f0c945ce4fc4828613f5eb3f752b Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank@brehm-online.com>
Date: Wed, 10 May 2017 23:52:19 +0200
Subject: [PATCH] Fixing test/test_magic.py

---
 test/test_magic.py      |  13 ++++++-------
 test/testdata/magic.pyc | Bin 0 -> 9170 bytes
 2 files changed, 6 insertions(+), 7 deletions(-)
 create mode 100644 test/testdata/magic.pyc

diff --git a/test/test_magic.py b/test/test_magic.py
index 6f4ed4e..a18fd5f 100755
--- a/test/test_magic.py
+++ b/test/test_magic.py
@@ -35,7 +35,6 @@ APPNAME = 'test_magic'
 LOG = logging.getLogger(APPNAME)
 
 
-
 # =============================================================================
 class MagicTest(LogtraceTestcase):
 
@@ -60,7 +59,7 @@ class MagicTest(LogtraceTestcase):
                 expected_value = (expected_value,)
 
             LOG.debug("Testing {!r}, expecting {!r}.".format(filename, expected_value))
-            
+
             for i in expected_value:
                 with open(filename, 'rb') as f:
                     buf_value = m.from_buffer(f.read())
@@ -71,7 +70,7 @@ class MagicTest(LogtraceTestcase):
                     break
             else:
                 self.assertTrue(False, "no match for " + repr(expected_value))
-                
+
     # -------------------------------------------------------------------------
     def test_mime_types(self):
 
@@ -84,7 +83,7 @@ class MagicTest(LogtraceTestcase):
             self.assert_values(m, {
                 'magic.pyc': 'application/octet-stream',
                 'test.pdf': 'application/pdf',
-                'test.gz': 'application/gzip',
+                'test.gz': ('application/gzip', 'application/x-gzip'),
                 'text.txt': 'text/plain',
                 b'\xce\xbb'.decode('utf-8'): 'text/plain',
                 b'\xce\xbb': 'text/plain',
@@ -101,7 +100,7 @@ class MagicTest(LogtraceTestcase):
         os.environ['TZ'] = 'UTC'  # To get the last modified date of test.gz in UTC
         try:
             self.assert_values(m, {
-                'magic.pyc': 'python 2.4 byte-compiled',
+                'magic.pyc': 'python 2.7 byte-compiled',
                 'test.pdf': 'PDF document, version 1.2',
                 'test.gz':
                 ('gzip compressed data, was "test", from Unix, last modified: Sun Jun 29 01:32:52 2008',
@@ -149,7 +148,7 @@ class MagicTest(LogtraceTestcase):
         LOG.debug("Testing {!r} - expecting {!r} - got {!r}.".format(
             filename, 'image/jpeg', result))
         self.assertEqual(result, 'image/jpeg')
-        
+
         m = magic.Magic(mime=True, keep_going=True)
         expected = ['image/jpeg', 'application/octet-stream']
         result = m.from_file(filename)
@@ -170,7 +169,7 @@ class MagicTest(LogtraceTestcase):
             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
diff --git a/test/testdata/magic.pyc b/test/testdata/magic.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..2a54c8df9e75c402db14866f103d9b738ed5cbfc
GIT binary patch
literal 9170
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

literal 0
HcmV?d00001

-- 
2.39.5