Stop using unittest (urllib3#1649)

Author: pquentin

dev-requirements.txt

@@ -5,9 +5,8 @@ wheel==0.30.0
 tornado==5.1.1
 PySocks==1.6.8
 pkginfo==1.4.2
-pytest-timeout==1.3.1
-pytest==4.0.0
-pluggy==0.11.0
+pytest-timeout==1.3.3
+pytest==4.6.4
 
 # https://github.com/ionelmc/python-lazy-object-proxy/issues/30
 lazy-object-proxy==1.4.0

dummyserver/testcase.py

@@ -1,5 +1,4 @@
 import threading
-import unittest
 
 import pytest
 from tornado import ioloop, web
@@ -20,7 +19,7 @@ def consume_socket(sock, chunks=65536):
         pass
 
 
-class SocketDummyServerTestCase(unittest.TestCase):
+class SocketDummyServerTestCase(object):
     """
     A simple socket-based server is created for this class that is good for
     exactly one request.
@@ -67,7 +66,7 @@ def start_basic_handler(cls, **kw):
         )
 
     @classmethod
-    def tearDownClass(cls):
+    def teardown_class(cls):
         if hasattr(cls, "server_thread"):
             cls.server_thread.join(0.1)
 
@@ -101,10 +100,10 @@ def _start_server(cls, socket_handler):
         cls.port = cls.server_thread.port
 
 
-class HTTPDummyServerTestCase(unittest.TestCase):
+class HTTPDummyServerTestCase(object):
     """ A simple HTTP server that runs when your test class runs
 
-    Have your unittest class inherit from this one, and then a simple server
+    Have your test class inherit from this one, and then a simple server
     will start when your tests run, and automatically shut down when they
     complete. For examples of what test requests you can send to the server,
     see the TestingApp in dummyserver/handlers.py.
@@ -131,11 +130,11 @@ def _stop_server(cls):
         cls.server_thread.join()
 
     @classmethod
-    def setUpClass(cls):
+    def setup_class(cls):
         cls._start_server()
 
     @classmethod
-    def tearDownClass(cls):
+    def teardown_class(cls):
         cls._stop_server()
 
 
@@ -150,7 +149,7 @@ class IPV6HTTPSDummyServerTestCase(HTTPSDummyServerTestCase):
     host = "::1"
 
 
-class HTTPDummyProxyTestCase(unittest.TestCase):
+class HTTPDummyProxyTestCase(object):
 
     http_host = "localhost"
     http_host_alt = "127.0.0.1"
@@ -163,7 +162,7 @@ class HTTPDummyProxyTestCase(unittest.TestCase):
     proxy_host_alt = "127.0.0.1"
 
     @classmethod
-    def setUpClass(cls):
+    def setup_class(cls):
         cls.io_loop = ioloop.IOLoop.current()
 
         app = web.Application([(r".*", TestingApp)])
@@ -184,7 +183,7 @@ def setUpClass(cls):
         cls.server_thread = run_loop_in_thread(cls.io_loop)
 
     @classmethod
-    def tearDownClass(cls):
+    def teardown_class(cls):
         cls.io_loop.add_callback(cls.http_server.stop)
         cls.io_loop.add_callback(cls.https_server.stop)
         cls.io_loop.add_callback(cls.proxy_server.stop)

setup.cfg

@@ -23,3 +23,4 @@ requires-dist =
 
 [tool:pytest]
 xfail_strict = true
+python_classes = Test *TestCase

test/appengine/test_gae_manager.py

@@ -37,7 +37,7 @@ def _absolute_url(self, path):
 # that URLFetch is used by the connection manager.
 @pytest.mark.usefixtures("testbed")
 class TestGAEConnectionManager(test_connectionpool.TestConnectionPool):
-    def setUp(self):
+    def setup_method(self, method):
         self.manager = appengine.AppEngineManager()
         self.pool = MockPool(self.host, self.port, self.manager)
 
@@ -105,7 +105,7 @@ def test_exceptions(self):
 
 @pytest.mark.usefixtures("testbed")
 class TestGAEConnectionManagerWithSSL(dummyserver.testcase.HTTPSDummyServerTestCase):
-    def setUp(self):
+    def setup_method(self, method):
         self.manager = appengine.AppEngineManager()
         self.pool = MockPool(self.host, self.port, self.manager, "https")
 
@@ -119,7 +119,7 @@ def test_exceptions(self):
 
 @pytest.mark.usefixtures("testbed")
 class TestGAERetry(test_connectionpool.TestRetry):
-    def setUp(self):
+    def setup_method(self, method):
         self.manager = appengine.AppEngineManager()
         self.pool = MockPool(self.host, self.port, self.manager)
 
@@ -159,7 +159,7 @@ def test_retry_return_in_response(self):
 
 @pytest.mark.usefixtures("testbed")
 class TestGAERetryAfter(test_connectionpool.TestRetryAfter):
-    def setUp(self):
+    def setup_method(self, method):
         # Disable urlfetch which doesn't respect Retry-After header.
         self.manager = appengine.AppEngineManager(urlfetch_retries=False)
         self.pool = MockPool(self.host, self.port, self.manager)

test/appengine/test_urlfetch.py

@@ -4,7 +4,6 @@
 
 import httplib
 import StringIO
-import unittest
 
 from mock import patch
 import pytest
@@ -45,7 +44,7 @@ def test_urlfetch_called_with_http(self):
 
 
 @pytest.mark.usefixtures("sandbox")
-class TestHTTPS(unittest.TestCase):
+class TestHTTPS(object):
     @pytest.mark.xfail(
         reason="This is not yet supported by urlfetch, presence of the ssl "
         "module will bypass urlfetch."

test/contrib/test_pyopenssl.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 import os
-import unittest
 
 import mock
 import pytest
@@ -49,7 +48,7 @@ def teardown_module():
 )
 
 
-class TestPyOpenSSLHelpers(unittest.TestCase):
+class TestPyOpenSSLHelpers(object):
     """
     Tests for PyOpenSSL helper functions.
     """

test/contrib/test_pyopenssl_dependencies.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-import unittest
 import pytest
 
 from mock import patch, Mock
@@ -28,7 +27,7 @@ def teardown_module():
         pass
 
 
-class TestPyOpenSSLInjection(unittest.TestCase):
+class TestPyOpenSSLInjection(object):
     """
     Tests for error handling in pyopenssl's 'inject_into urllib3'
     """

test/test_no_ssl.py

@@ -6,7 +6,6 @@
 """
 
 import sys
-import unittest
 import pytest
 
 
@@ -64,15 +63,16 @@ def pop(self):
 module_stash = ModuleStash("urllib3")
 
 
-class TestWithoutSSL(unittest.TestCase):
-    def setUp(self):
+class TestWithoutSSL(object):
+    @classmethod
+    def setup_class(self):
         sys.modules.pop("ssl", None)
         sys.modules.pop("_ssl", None)
 
         module_stash.stash()
         sys.meta_path.insert(0, ssl_blocker)
 
-    def tearDown(self):
+    def teardown_class(self):
         sys.meta_path.remove(ssl_blocker)
         module_stash.pop()
 

test/with_dummyserver/test_connectionpool.py

@@ -2,7 +2,6 @@
 import logging
 import socket
 import sys
-import unittest
 import time
 import warnings
 import pytest
@@ -1159,7 +1158,3 @@ def test_pool_size_redirect(self):
         ) as pool:
             pool.urlopen("GET", "/redirect", preload_content=False)
             assert pool.num_connections == 1
-
-
-if __name__ == "__main__":
-    unittest.main()

test/with_dummyserver/test_https.py

@@ -3,7 +3,6 @@
 import logging
 import ssl
 import sys
-import unittest
 import warnings
 
 import mock
@@ -784,7 +783,3 @@ def test_can_validate_ipv6_san(self):
         ) as https_pool:
             r = https_pool.request("GET", "/")
             assert r.status == 200
-
-
-if __name__ == "__main__":
-    unittest.main()