Skip to content

Commit bd0d1f3

Browse files
committed
Added the pytest classifier.
Better 3.5 tests.
1 parent ae9b430 commit bd0d1f3

File tree

2 files changed

+35
-24
lines changed

2 files changed

+35
-24
lines changed

Diff for: setup.py

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ def find_version(*file_paths):
3939
"Programming Language :: Python :: 3.4",
4040
"Programming Language :: Python :: 3.5",
4141
"Topic :: Software Development :: Testing",
42+
"Framework :: Pytest",
4243
],
4344
install_requires=[
4445
'pytest',

Diff for: tests/test_simple_35.py

+34-24
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66

77
@asyncio.coroutine
8-
def async_coro(loop):
9-
yield from asyncio.sleep(0, loop=loop)
8+
async def async_coro(loop):
9+
await asyncio.sleep(0, loop=loop)
1010
return 'ok'
1111

1212

@@ -40,8 +40,7 @@ async def closer(_, writer):
4040
await server1.wait_closed()
4141

4242

43-
@pytest.mark.asyncio
44-
async def test_unused_port_factory_fixture(unused_tcp_port_factory, event_loop):
43+
def test_unused_port_factory_fixture(unused_tcp_port_factory, event_loop):
4544
"""Test the unused TCP port factory fixture."""
4645

4746
async def closer(_, writer):
@@ -50,28 +49,34 @@ async def closer(_, writer):
5049
port1, port2, port3 = (unused_tcp_port_factory(), unused_tcp_port_factory(),
5150
unused_tcp_port_factory())
5251

53-
server1 = await asyncio.start_server(closer, host='localhost',
54-
port=port1,
55-
loop=event_loop)
56-
server2 = await asyncio.start_server(closer, host='localhost',
57-
port=port2,
58-
loop=event_loop)
59-
server3 = await asyncio.start_server(closer, host='localhost',
60-
port=port3,
61-
loop=event_loop)
52+
async def run_test():
53+
server1 = await asyncio.start_server(closer, host='localhost',
54+
port=port1,
55+
loop=event_loop)
56+
server2 = await asyncio.start_server(closer, host='localhost',
57+
port=port2,
58+
loop=event_loop)
59+
server3 = await asyncio.start_server(closer, host='localhost',
60+
port=port3,
61+
loop=event_loop)
6262

63-
for port in port1, port2, port3:
64-
with pytest.raises(IOError):
65-
await asyncio.start_server(closer, host='localhost',
66-
port=port,
67-
loop=event_loop)
63+
for port in port1, port2, port3:
64+
with pytest.raises(IOError):
65+
await asyncio.start_server(closer, host='localhost',
66+
port=port,
67+
loop=event_loop)
6868

69-
server1.close()
70-
await server1.wait_closed()
71-
server2.close()
72-
await server2.wait_closed()
73-
server3.close()
74-
await server3.wait_closed()
69+
server1.close()
70+
await server1.wait_closed()
71+
server2.close()
72+
await server2.wait_closed()
73+
server3.close()
74+
await server3.wait_closed()
75+
76+
event_loop.run_until_complete(run_test())
77+
78+
event_loop.stop()
79+
event_loop.close()
7580

7681

7782
class Test:
@@ -82,3 +87,8 @@ async def test_asyncio_marker_method(self, event_loop):
8287
"""Test the asyncio pytest marker in a Test class."""
8388
ret = await async_coro(event_loop)
8489
assert ret == 'ok'
90+
91+
92+
def test_async_close_loop(event_loop):
93+
event_loop.close()
94+
return 'ok'

0 commit comments

Comments
 (0)