Skip to content

Commit 4bda684

Browse files
committed
fix test for xenial since travis started enabling it
1 parent a60800c commit 4bda684

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

test/test.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def assert_values(self, m, expected_values):
1717
except TypeError:
1818
filename = os.path.join(self.TESTDATA_DIR.encode('utf-8'), filename)
1919

20-
20+
2121
if type(expected_value) is not tuple:
2222
expected_value = (expected_value,)
2323

@@ -37,7 +37,7 @@ def test_from_buffer_str_and_bytes(self):
3737
self.assertEqual("text/x-python", m.from_buffer(s))
3838
b = b'#!/usr/bin/env python\nprint("foo")'
3939
self.assertEqual("text/x-python", m.from_buffer(b))
40-
40+
4141
def test_mime_types(self):
4242
dest = os.path.join(MagicTest.TESTDATA_DIR, b'\xce\xbb'.decode('utf-8'))
4343
shutil.copyfile(os.path.join(MagicTest.TESTDATA_DIR, 'lambda'), dest)
@@ -92,9 +92,9 @@ def test_keep_going(self):
9292

9393
m = magic.Magic(mime=True)
9494
self.assertEqual(m.from_file(filename), 'image/jpeg')
95-
95+
9696
m = magic.Magic(mime=True, keep_going=True)
97-
self.assertEqual(m.from_file(filename), 'image/jpeg')
97+
self.assertEqual(m.from_file(filename), 'image/jpeg\\012- application/octet-stream')
9898

9999

100100
def test_rethrow(self):
@@ -103,7 +103,7 @@ def test_rethrow(self):
103103
def t(x,y):
104104
raise magic.MagicException("passthrough")
105105
magic.magic_buffer = t
106-
106+
107107
self.assertRaises(magic.MagicException, magic.from_buffer, "hello", True)
108108
finally:
109109
magic.magic_buffer = old

0 commit comments

Comments
 (0)