update tests. drop py2 support

Author: nkanaev

.travis.yml

@@ -1,3 +1,4 @@
+dist: xenial
 language: python
-python: ['2.7', '3.6']
-script: python tests.py
+python: ['3.4', '3.5', '3.6', '3.7']
+script: python3 setup.py test

setup.py

@@ -1,8 +1,18 @@
 # coding: utf-8
 from setuptools import setup
+from setuptools.command.test import test as TestCommand
+
 import imgspy
 
 
+class PyTestCommand(TestCommand):
+    user_options = [("pytest-args=", "a", "Arguments to pass to pytest")]
+
+    def run_tests(self):
+        import sys, pytest
+        sys.exit(pytest.main([]))
+
+
 setup(
     name='imgspy',
     version=imgspy.__version__,
@@ -25,5 +35,7 @@
     author='Nazar Kanaev',
     author_email='[email protected]',
     py_modules=['imgspy'],
-    test_suite='tests'
+    test_suite='tests',
+    tests_require=['pytest'],
+    cmdclass={"test": PyTestCommand},
 )

test_imgspy.py

@@ -0,0 +1,43 @@
+import os
+import re
+import glob
+import textwrap
+import urllib.request
+
+import imgspy
+
+
+BASEDIR = os.path.dirname(os.path.abspath(__file__))
+FORMAT = r'sample(?P<width>\d+)x(?P<height>\d+)(?P<comment>[^.]*).(?P<format>\w+)'
+
+
+def test_samples():
+    for filepath in glob.glob(os.path.join(BASEDIR, 'fixtures/sample*')):
+        filename = os.path.basename(filepath)
+        match = re.match(FORMAT, filename)
+        expected = {
+            'type': match.group('format'),
+            'width': int(match.group('width')),
+            'height': int(match.group('height'))}
+
+        actual = imgspy.info(open(filepath, 'rb'))
+        assert isinstance(actual, dict), filename
+
+        actual_subset = {k: v for k, v in actual.items() if k in expected}
+        assert actual_subset == expected, filename
+
+
+def test_datastr():
+    data = textwrap.dedent('''data:image/png;base64,
+        iVBORw0KGgoAAAANSUhEUgAAAAIAAAABCAYAAAD0In+
+        KAAAAD0lEQVR42mNk+M9QzwAEAAmGAYCF+yOnAAAAAElFTkSuQmCC''')
+    assert imgspy.info(data) == {'type': 'png', 'width': 2, 'height': 1}
+
+
+def test_url():
+    domain = 'http://via.placeholder.com'
+    urls = {
+        domain + '/500x500.png': {'type': 'png', 'width': 500, 'height': 500},
+        domain + '/500x500.jpg': {'type': 'jpg', 'width': 500, 'height': 500},}
+    for url, expected in urls.items():
+        assert imgspy.info(urllib.request.urlopen(url)) == expected