Removed dependency on unittest.TestCase base class

Author: miguelgrinberg

tests/async/test_aiohttp.py

@@ -1,10 +1,9 @@
-import unittest
 from unittest import mock
 
 from engineio.async_drivers import aiohttp as async_aiohttp
 
 
-class AiohttpTests(unittest.TestCase):
+class TestAiohttp:
     def test_create_route(self):
         app = mock.MagicMock()
         mock_server = mock.MagicMock()

tests/async/test_asgi.py

@@ -1,6 +1,5 @@
 import asyncio
 import os
-import unittest
 from unittest import mock
 
 from engineio.async_drivers import asgi as async_asgi
@@ -22,7 +21,7 @@ def _run(coro):
     return asyncio.get_event_loop().run_until_complete(coro)
 
 
-class AsgiTests(unittest.TestCase):
+class TestAsgi:
     def test_create_app(self):
         app = async_asgi.ASGIApp(
             'eio',

tests/async/test_client.py

@@ -1,7 +1,5 @@
 import asyncio
 import ssl
-import sys
-import unittest
 from unittest import mock
 
 try:
@@ -33,8 +31,7 @@ def _run(coro):
     return asyncio.get_event_loop().run_until_complete(coro)
 
 
-@unittest.skipIf(sys.version_info < (3, 5), 'only for Python 3.5+')
-class TestAsyncClient(unittest.TestCase):
+class TestAsyncClient:
     def test_is_asyncio_based(self):
         c = async_client.AsyncClient()
         assert c.is_asyncio_based()

tests/async/test_server.py

@@ -2,7 +2,6 @@
 import gzip
 import io
 import logging
-import unittest
 from unittest import mock
 import zlib
 
@@ -32,7 +31,7 @@ def _run(coro):
     return asyncio.get_event_loop().run_until_complete(coro)
 
 
-class TestAsyncServer(unittest.TestCase):
+class TestAsyncServer:
     @staticmethod
     def get_async_mock(environ={'REQUEST_METHOD': 'GET', 'QUERY_STRING': ''}):
         if environ.get('QUERY_STRING'):
@@ -67,17 +66,17 @@ def _get_mock_socket(self):
         return mock_socket
 
     @classmethod
-    def setUpClass(cls):
+    def setup_class(cls):
         async_server.AsyncServer._default_monitor_clients = False
 
     @classmethod
-    def tearDownClass(cls):
+    def teardown_class(cls):
         async_server.AsyncServer._default_monitor_clients = True
 
-    def setUp(self):
+    def setup_method(self):
         logging.getLogger('engineio').setLevel(logging.NOTSET)
 
-    def tearDown(self):
+    def teardown_method(self):
         # restore JSON encoder, in case a test changed it
         packet.Packet.json = json
 
@@ -1030,11 +1029,12 @@ def test_background_tasks(self):
         async def foo(arg):
             r.append(arg)
 
-        s = async_server.AsyncServer()
-        s.start_background_task(foo, 'bar')
-        pending = asyncio.all_tasks(loop=asyncio.get_event_loop()) \
-            if hasattr(asyncio, 'all_tasks') else asyncio.Task.all_tasks()
-        asyncio.get_event_loop().run_until_complete(asyncio.wait(pending))
+        async def main():
+            s = async_server.AsyncServer()
+            task = s.start_background_task(foo, 'bar')
+            await task
+
+        _run(main())
         assert r == ['bar']
 
     def test_sleep(self):

tests/async/test_socket.py

@@ -1,6 +1,5 @@
 import asyncio
 import time
-import unittest
 from unittest import mock
 
 import pytest
@@ -27,7 +26,7 @@ def _run(coro):
     return asyncio.get_event_loop().run_until_complete(coro)
 
 
-class TestSocket(unittest.TestCase):
+class TestSocket:
     def _get_read_mock_coro(self, payload):
         mock_input = mock.MagicMock()
         mock_input.read = AsyncMock()

tests/async/test_tornado.py

@@ -1,5 +1,4 @@
 import asyncio
-import unittest
 from unittest import mock
 
 try:
@@ -15,7 +14,7 @@ def _run(coro):
     return asyncio.get_event_loop().run_until_complete(coro)
 
 
-class TornadoTests(unittest.TestCase):
+class TestTornado:
     def test_get_tornado_handler(self):
         mock_server = mock.MagicMock()
         handler = async_tornado.get_tornado_handler(mock_server)

tests/common/test_client.py

@@ -1,7 +1,6 @@
 import logging
 import ssl
 import time
-import unittest
 from unittest import mock
 
 import pytest
@@ -15,7 +14,7 @@
 from engineio import payload
 
 
-class TestClient(unittest.TestCase):
+class TestClient:
     def test_is_asyncio_based(self):
         c = client.Client()
         assert not c.is_asyncio_based()

tests/common/test_middleware.py

@@ -1,11 +1,10 @@
 import os
-import unittest
 from unittest import mock
 
 import engineio
 
 
-class TestWSGIApp(unittest.TestCase):
+class TestWSGIApp:
     def test_wsgi_routing(self):
         mock_wsgi_app = mock.MagicMock()
         mock_eio_app = 'foo'

tests/common/test_packet.py

@@ -1,11 +1,9 @@
-import unittest
-
 import pytest
 
 from engineio import packet
 
 
-class TestPacket(unittest.TestCase):
+class TestPacket:
     def test_encode_default_packet(self):
         pkt = packet.Packet()
         assert pkt.packet_type == packet.NOOP

tests/common/test_payload.py

@@ -1,12 +1,10 @@
-import unittest
-
 import pytest
 
 from engineio import packet
 from engineio import payload
 
 
-class TestPayload(unittest.TestCase):
+class TestPayload:
     def test_encode_empty_payload(self):
         p = payload.Payload()
         assert p.packets == []

tests/common/test_server.py

@@ -4,7 +4,6 @@
 import logging
 import sys
 import time
-import unittest
 from unittest import mock
 import zlib
 
@@ -25,7 +24,7 @@ def _mock_import(module, *args, **kwargs):
     return module
 
 
-class TestServer(unittest.TestCase):
+class TestServer:
     _mock_async = mock.MagicMock()
     _mock_async._async = {
         'thread': 't',
@@ -43,17 +42,17 @@ def _get_mock_socket(self):
         return mock_socket
 
     @classmethod
-    def setUpClass(cls):
+    def setup_class(cls):
         server.Server._default_monitor_clients = False
 
     @classmethod
-    def tearDownClass(cls):
+    def teardown_class(cls):
         server.Server._default_monitor_clients = True
 
-    def setUp(self):
+    def setup_method(self):
         logging.getLogger('engineio').setLevel(logging.NOTSET)
 
-    def tearDown(self):
+    def teardown_method(self):
         # restore JSON encoder, in case a test changed it
         packet.Packet.json = json
 

tests/common/test_socket.py

@@ -1,6 +1,5 @@
 import io
 import time
-import unittest
 from unittest import mock
 
 import pytest
@@ -11,8 +10,8 @@
 from engineio import socket
 
 
-class TestSocket(unittest.TestCase):
-    def setUp(self):
+class TestSocket:
+    def setup_method(self):
         self.bg_tasks = []
 
     def _get_mock_server(self):