mirror
/
miguelgrinberg.python-socketio
mirror of https://github.com/miguelgrinberg/python-socketio
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

unit test reorganization

pull/238/head
Miguel Grinberg 6 years ago
parent
9f2186725a
commit
b0a8b1f31b
17 changed files with 40 additions and 82 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      setup.py
  2. 0
      tests/asyncio/__init__.py
  3. 21
      tests/asyncio/test_asyncio_client.py
  4. 13
      tests/asyncio/test_asyncio_manager.py
  5. 31
      tests/asyncio/test_asyncio_namespace.py
  6. 15
      tests/asyncio/test_asyncio_pubsub_manager.py
  7. 3
      tests/asyncio/test_asyncio_redis_manager.py
  8. 33
      tests/asyncio/test_asyncio_server.py
  9. 0
      tests/common/__init__.py
  10. 0
      tests/common/test_base_manager.py
  11. 0
      tests/common/test_client.py
  12. 0
      tests/common/test_middleware.py
  13. 0
      tests/common/test_namespace.py
  14. 0
      tests/common/test_packet.py
  15. 0
      tests/common/test_pubsub_manager.py
  16. 0
      tests/common/test_server.py
  17. 3
      tox.ini

3
setup.py
View File

@ -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',

0
tests/asyncio/__init__.py
View File

21
tests/test_asyncio_client.py → tests/asyncio/test_asyncio_client.py
View File

@ -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()

13
tests/test_asyncio_manager.py → tests/asyncio/test_asyncio_manager.py
View File

@ -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

31
tests/test_asyncio_namespace.py → tests/asyncio/test_asyncio_namespace.py
View File

@ -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')

15
tests/test_asyncio_pubsub_manager.py → tests/asyncio/test_asyncio_pubsub_manager.py
View File

@ -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

3
tests/test_asyncio_redis_manager.py → tests/asyncio/test_asyncio_redis_manager.py
View File

@ -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+')

33
tests/test_asyncio_server.py → tests/asyncio/test_asyncio_server.py
View File

@ -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()

0
tests/common/__init__.py
View File

0
tests/test_base_manager.py → tests/common/test_base_manager.py
View File

0
tests/test_client.py → tests/common/test_client.py
View File

0
tests/test_middleware.py → tests/common/test_middleware.py
View File

0
tests/test_namespace.py → tests/common/test_namespace.py
View File

0
tests/test_packet.py → tests/common/test_packet.py
View File

0
tests/test_pubsub_manager.py → tests/common/test_pubsub_manager.py
View File

0
tests/test_server.py → tests/common/test_server.py
View File

3
tox.ini
View File

@ -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

Write Preview
Loading…
Cancel
Save