summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rwxr-xr-xtest/run.sh4
-rwxr-xr-xtest/test.py7
2 files changed, 10 insertions, 1 deletions
diff --git a/test/run.sh b/test/run.sh
index 3768497..2764e15 100755
--- a/test/run.sh
+++ b/test/run.sh
@@ -1,12 +1,14 @@
#!/bin/sh
-set -e
# ensure we can use unicode filenames in the test
export LC_ALL=en_US.UTF-8
THISDIR=`dirname $0`
export PYTHONPATH=${THISDIR}/..
+echo "python2.6"
python2.6 ${THISDIR}/test.py
+echo "python2.7"
python2.7 ${THISDIR}/test.py
+echo "python3.0"
python3 ${THISDIR}/test.py
diff --git a/test/test.py b/test/test.py
index 6ae5c07..78ddb2b 100755
--- a/test/test.py
+++ b/test/test.py
@@ -30,6 +30,13 @@ class MagicTest(unittest.TestCase):
break
else:
self.assertTrue(False, "no match for " + repr(expected_value))
+
+ def test_from_buffer_str_and_bytes(self):
+ m = magic.Magic(mime=True)
+ s = '#!/usr/bin/env python\nprint("foo")'
+ 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'))