Use pytest for tests & fix issue for URLs with usernames

Author: sylvinus

.gitignore

@@ -2,4 +2,5 @@
 /venv
 /src
 /build
-*.so
+*.so
+/.cache

Makefile

@@ -5,7 +5,7 @@ benchmark:
 	python benchmarks/urls.py
 
 test:
-	python tests/test_*.py
+	py.test tests/ -v
 
 docker_build:
 	docker build -t commonsearch/urlparse4 .

requirements.txt

@@ -1,5 +1,6 @@
 tabulate==0.7.5
 Cython==0.24
+pytest==2.9.2
 
 # For benchmarks
 uritools==1.0.2

tests/test_urlparse.py

@@ -630,8 +630,8 @@ def test_portseparator(self):
         self.assertEqual(urlparse.urlparse("http://www.python.org:80"),
                 ('http','www.python.org:80','','','',''))
 
-def test_main():
-    test_support.run_unittest(UrlParseTestCase)
+# def test_main():
+#     test_support.run_unittest(UrlParseTestCase)
 
-if __name__ == "__main__":
-    test_main()
+# if __name__ == "__main__":
+#     test_main()

tests/test_urlparse4.py

@@ -0,0 +1,23 @@
+# https://github.com/python/cpython/blob/40dac3272231773af0015fc35df5353783d77c4e/Lib/test/test_urlparse.py
+import sys
+import os
+sys.path.insert(-1, os.path.dirname(os.path.dirname(__file__)))
+
+from test import test_support
+import unittest
+import urlparse4 as urlparse
+
+
+urlsplit_testcases = [
+    ["mailto:webtechs@oltn.odl.state.ok.us", ("mailto", "webtechs@oltn.odl.state.ok.us", "", "", "")],
+    ["mailto:mailto:webtechs@oltn.odl.state.ok.us", ("mailto", "mailto:webtechs@oltn.odl.state.ok.us", "", "", "")],
+    ["http://a@example.com:80", ("http", "a@example.com:80", "", "", "")],
+
+]
+
+
+class UrlParse4TestCase(unittest.TestCase):
+
+    def test_urlsplit(self):
+        for case in urlsplit_testcases:
+            self.assertEqual(urlparse.urlsplit(case[0]), case[1])