From b0a8b1f31bce4305c00ab0937ddfec1120a2d49d Mon Sep 17 00:00:00 2001 From: Miguel Grinberg Date: Thu, 3 Jan 2019 19:08:44 +0000 Subject: [PATCH] unit test reorganization --- setup.py | 3 +- tests/asyncio/__init__.py | 0 tests/{ => asyncio}/test_asyncio_client.py | 21 ++++-------- tests/{ => asyncio}/test_asyncio_manager.py | 13 ++------ tests/{ => asyncio}/test_asyncio_namespace.py | 31 +++++------------ .../test_asyncio_pubsub_manager.py | 15 +++------ .../test_asyncio_redis_manager.py | 3 +- tests/{ => asyncio}/test_asyncio_server.py | 33 ++++++++----------- tests/common/__init__.py | 0 tests/{ => common}/test_base_manager.py | 0 tests/{ => common}/test_client.py | 0 tests/{ => common}/test_middleware.py | 0 tests/{ => common}/test_namespace.py | 0 tests/{ => common}/test_packet.py | 0 tests/{ => common}/test_pubsub_manager.py | 0 tests/{ => common}/test_server.py | 0 tox.ini | 3 +- 17 files changed, 40 insertions(+), 82 deletions(-) create mode 100644 tests/asyncio/__init__.py rename tests/{ => asyncio}/test_asyncio_client.py (98%) rename tests/{ => asyncio}/test_asyncio_manager.py (97%) rename tests/{ => asyncio}/test_asyncio_namespace.py (93%) rename tests/{ => asyncio}/test_asyncio_pubsub_manager.py (97%) rename tests/{ => asyncio}/test_asyncio_redis_manager.py (96%) rename tests/{ => asyncio}/test_asyncio_server.py (97%) create mode 100644 tests/common/__init__.py rename tests/{ => common}/test_base_manager.py (100%) rename tests/{ => common}/test_client.py (100%) rename tests/{ => common}/test_middleware.py (100%) rename tests/{ => common}/test_namespace.py (100%) rename tests/{ => common}/test_packet.py (100%) rename tests/{ => common}/test_pubsub_manager.py (100%) rename tests/{ => common}/test_server.py (100%) diff --git a/setup.py b/setup.py index 63ce52c..7eb6333 100755 --- a/setup.py +++ b/setup.py @@ -6,6 +6,7 @@ Socket.IO server. """ import re from setuptools import setup +import six with open('socketio/__init__.py', 'r') as f: version = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]', @@ -42,7 +43,7 @@ setup( tests_require=[ 'mock', ], - test_suite='tests', + test_suite='tests' if six.PY3 else 'tests.common', classifiers=[ 'Environment :: Web Environment', 'Intended Audience :: Developers', diff --git a/tests/asyncio/__init__.py b/tests/asyncio/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/test_asyncio_client.py b/tests/asyncio/test_asyncio_client.py similarity index 98% rename from tests/test_asyncio_client.py rename to tests/asyncio/test_asyncio_client.py index 85dc735..78bca0f 100644 --- a/tests/test_asyncio_client.py +++ b/tests/asyncio/test_asyncio_client.py @@ -1,3 +1,4 @@ +import asyncio import sys import unittest @@ -7,26 +8,18 @@ if six.PY3: else: import mock +from socketio import asyncio_client +from socketio import asyncio_namespace from engineio import exceptions as engineio_exceptions from socketio import exceptions from socketio import packet -if six.PY3: - import asyncio - from asyncio import coroutine - from socketio import asyncio_client - from socketio import asyncio_namespace -else: - # mock coroutine so that Python 2 doesn't complain - def coroutine(f): - return f def AsyncMock(*args, **kwargs): """Return a mock asynchronous function.""" m = mock.MagicMock(*args, **kwargs) - @coroutine - def mock_coro(*args, **kwargs): + async def mock_coro(*args, **kwargs): return m(*args, **kwargs) mock_coro.mock = m @@ -119,8 +112,7 @@ class TestAsyncClient(unittest.TestCase): c.sleep = AsyncMock() states = ['disconnected'] - @coroutine - def fake_wait(): + async def fake_wait(): c.eio.state = states.pop(0) c._reconnect_task = fake_wait() @@ -134,8 +126,7 @@ class TestAsyncClient(unittest.TestCase): c.sleep = AsyncMock() states = ['connected', 'disconnected'] - @coroutine - def fake_wait(): + async def fake_wait(): c.eio.state = states.pop(0) c._reconnect_task = fake_wait() diff --git a/tests/test_asyncio_manager.py b/tests/asyncio/test_asyncio_manager.py similarity index 97% rename from tests/test_asyncio_manager.py rename to tests/asyncio/test_asyncio_manager.py index 926d854..2687a4b 100644 --- a/tests/test_asyncio_manager.py +++ b/tests/asyncio/test_asyncio_manager.py @@ -1,3 +1,4 @@ +import asyncio import sys import unittest @@ -7,22 +8,14 @@ if six.PY3: else: import mock -if sys.version_info >= (3, 5): - import asyncio - from asyncio import coroutine - from socketio import asyncio_manager -else: - # mock coroutine so that Python 2 doesn't complain - def coroutine(f): - return f +from socketio import asyncio_manager def AsyncMock(*args, **kwargs): """Return a mock asynchronous function.""" m = mock.MagicMock(*args, **kwargs) - @coroutine - def mock_coro(*args, **kwargs): + async def mock_coro(*args, **kwargs): return m(*args, **kwargs) mock_coro.mock = m diff --git a/tests/test_asyncio_namespace.py b/tests/asyncio/test_asyncio_namespace.py similarity index 93% rename from tests/test_asyncio_namespace.py rename to tests/asyncio/test_asyncio_namespace.py index b99cd20..c3a3178 100644 --- a/tests/test_asyncio_namespace.py +++ b/tests/asyncio/test_asyncio_namespace.py @@ -1,3 +1,4 @@ +import asyncio import sys import unittest @@ -7,22 +8,14 @@ if six.PY3: else: import mock -if sys.version_info >= (3, 5): - import asyncio - from asyncio import coroutine - from socketio import asyncio_namespace -else: - # mock coroutine so that Python 2 doesn't complain - def coroutine(f): - return f +from socketio import asyncio_namespace def AsyncMock(*args, **kwargs): """Return a mock asynchronous function.""" m = mock.MagicMock(*args, **kwargs) - @coroutine - def mock_coro(*args, **kwargs): + async def mock_coro(*args, **kwargs): return m(*args, **kwargs) mock_coro.mock = m @@ -40,8 +33,7 @@ class TestAsyncNamespace(unittest.TestCase): result = {} class MyNamespace(asyncio_namespace.AsyncNamespace): - @coroutine - def on_connect(self, sid, environ): + async def on_connect(self, sid, environ): result['result'] = (sid, environ) ns = MyNamespace('/foo') @@ -53,8 +45,7 @@ class TestAsyncNamespace(unittest.TestCase): result = {} class MyNamespace(asyncio_namespace.AsyncNamespace): - @coroutine - def on_disconnect(self, sid): + async def on_disconnect(self, sid): result['result'] = sid ns = MyNamespace('/foo') @@ -78,8 +69,7 @@ class TestAsyncNamespace(unittest.TestCase): result = {} class MyNamespace(asyncio_namespace.AsyncNamespace): - @coroutine - def on_custom_message(self, sid, data): + async def on_custom_message(self, sid, data): result['result'] = (sid, data) ns = MyNamespace('/foo') @@ -91,8 +81,7 @@ class TestAsyncNamespace(unittest.TestCase): result = {} class MyNamespace(asyncio_namespace.AsyncNamespace): - @coroutine - def on_custom_message(self, sid, data): + async def on_custom_message(self, sid, data): result['result'] = (sid, data) ns = MyNamespace('/foo') @@ -217,8 +206,7 @@ class TestAsyncNamespace(unittest.TestCase): result = {} class MyNamespace(asyncio_namespace.AsyncClientNamespace): - @coroutine - def on_custom_message(self, sid, data): + async def on_custom_message(self, sid, data): result['result'] = (sid, data) ns = MyNamespace('/foo') @@ -230,8 +218,7 @@ class TestAsyncNamespace(unittest.TestCase): result = {} class MyNamespace(asyncio_namespace.AsyncClientNamespace): - @coroutine - def on_custom_message(self, sid, data): + async def on_custom_message(self, sid, data): result['result'] = (sid, data) ns = MyNamespace('/foo') diff --git a/tests/test_asyncio_pubsub_manager.py b/tests/asyncio/test_asyncio_pubsub_manager.py similarity index 97% rename from tests/test_asyncio_pubsub_manager.py rename to tests/asyncio/test_asyncio_pubsub_manager.py index b18e51d..53e4b6b 100644 --- a/tests/test_asyncio_pubsub_manager.py +++ b/tests/asyncio/test_asyncio_pubsub_manager.py @@ -1,3 +1,4 @@ +import asyncio import functools import sys import unittest @@ -8,23 +9,15 @@ if six.PY3: else: import mock -if sys.version_info >= (3, 5): - import asyncio - from asyncio import coroutine - from socketio import asyncio_manager - from socketio import asyncio_pubsub_manager -else: - # mock coroutine so that Python 2 doesn't complain - def coroutine(f): - return f +from socketio import asyncio_manager +from socketio import asyncio_pubsub_manager def AsyncMock(*args, **kwargs): """Return a mock asynchronous function.""" m = mock.MagicMock(*args, **kwargs) - @coroutine - def mock_coro(*args, **kwargs): + async def mock_coro(*args, **kwargs): return m(*args, **kwargs) mock_coro.mock = m diff --git a/tests/test_asyncio_redis_manager.py b/tests/asyncio/test_asyncio_redis_manager.py similarity index 96% rename from tests/test_asyncio_redis_manager.py rename to tests/asyncio/test_asyncio_redis_manager.py index 6beb1e9..02c12d6 100644 --- a/tests/test_asyncio_redis_manager.py +++ b/tests/asyncio/test_asyncio_redis_manager.py @@ -1,8 +1,7 @@ import sys import unittest -if sys.version_info >= (3, 5): - from socketio import asyncio_redis_manager +from socketio import asyncio_redis_manager @unittest.skipIf(sys.version_info < (3, 5), 'only for Python 3.5+') diff --git a/tests/test_asyncio_server.py b/tests/asyncio/test_asyncio_server.py similarity index 97% rename from tests/test_asyncio_server.py rename to tests/asyncio/test_asyncio_server.py index 3738cda..4761050 100644 --- a/tests/test_asyncio_server.py +++ b/tests/asyncio/test_asyncio_server.py @@ -1,3 +1,4 @@ +import asyncio import json import logging import sys @@ -9,25 +10,17 @@ if six.PY3: else: import mock +from socketio import asyncio_server +from socketio import asyncio_namespace from socketio import packet from socketio import namespace -if sys.version_info >= (3, 5): - import asyncio - from asyncio import coroutine - from socketio import asyncio_server - from socketio import asyncio_namespace -else: - # mock coroutine so that Python 2 doesn't complain - def coroutine(f): - return f def AsyncMock(*args, **kwargs): """Return a mock asynchronous function.""" m = mock.MagicMock(*args, **kwargs) - @coroutine - def mock_coro(*args, **kwargs): + async def mock_coro(*args, **kwargs): return m(*args, **kwargs) mock_coro.mock = m @@ -476,12 +469,15 @@ class TestAsyncServer(unittest.TestCase): self.assertEqual(session, {'foo': 'bar'}) session['foo'] = 'baz' session['bar'] = 'foo' - self.assertEqual(await s.get_session('123'), {'foo': 'baz', 'bar': 'foo'}) - self.assertEqual(fake_session, {'/': {'foo': 'baz', 'bar': 'foo'}}) + self.assertEqual(await s.get_session('123'), + {'foo': 'baz', 'bar': 'foo'}) + self.assertEqual(fake_session, + {'/': {'foo': 'baz', 'bar': 'foo'}}) async with s.session('123', namespace='/ns') as session: self.assertEqual(session, {}) session['a'] = 'b' - self.assertEqual(await s.get_session('123', namespace='/ns'), {'a': 'b'}) + self.assertEqual(await s.get_session('123', namespace='/ns'), + {'a': 'b'}) self.assertEqual(fake_session, {'/': {'foo': 'baz', 'bar': 'foo'}, '/ns': {'a': 'b'}}) _run(_test()) @@ -528,19 +524,16 @@ class TestAsyncServer(unittest.TestCase): def on_connect(self, sid, environ): result['result'] = (sid, environ) - @coroutine - def on_disconnect(self, sid): + async def on_disconnect(self, sid): result['result'] = ('disconnect', sid) - @coroutine - def on_foo(self, sid, data): + async def on_foo(self, sid, data): result['result'] = (sid, data) def on_bar(self, sid): result['result'] = 'bar' - @coroutine - def on_baz(self, sid, data1, data2): + async def on_baz(self, sid, data1, data2): result['result'] = (data1, data2) s = asyncio_server.AsyncServer() diff --git a/tests/common/__init__.py b/tests/common/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/test_base_manager.py b/tests/common/test_base_manager.py similarity index 100% rename from tests/test_base_manager.py rename to tests/common/test_base_manager.py diff --git a/tests/test_client.py b/tests/common/test_client.py similarity index 100% rename from tests/test_client.py rename to tests/common/test_client.py diff --git a/tests/test_middleware.py b/tests/common/test_middleware.py similarity index 100% rename from tests/test_middleware.py rename to tests/common/test_middleware.py diff --git a/tests/test_namespace.py b/tests/common/test_namespace.py similarity index 100% rename from tests/test_namespace.py rename to tests/common/test_namespace.py diff --git a/tests/test_packet.py b/tests/common/test_packet.py similarity index 100% rename from tests/test_packet.py rename to tests/common/test_packet.py diff --git a/tests/test_pubsub_manager.py b/tests/common/test_pubsub_manager.py similarity index 100% rename from tests/test_pubsub_manager.py rename to tests/common/test_pubsub_manager.py diff --git a/tests/test_server.py b/tests/common/test_server.py similarity index 100% rename from tests/test_server.py rename to tests/common/test_server.py diff --git a/tox.ini b/tox.ini index 33323a2..9f7b809 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,7 @@ deps= coverage mock basepython = - flake8: python3.6 + flake8: python3.5 py27: python2.7 py35: python3.5 py36: python3.6 @@ -23,6 +23,7 @@ basepython = [testenv:flake8] deps= + six flake8 commands= flake8 --exclude=".*" --ignore=E402,E722 socketio tests