Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 99ee6e4

Browse files
bombelabombela
authored
Merge pull request 0rpc#247 from kloczek/master
Move from deprecated nose to pytest (solves 0rpc#243)
2 parents 6e21cd2 + f662983 commit 99ee6e4

9 files changed

+58
-58
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ script:
2929
- if [ $TRAVIS_PYTHON_VERSION != '2.6' ]; then
3030
flake8 --ignore=E501,E128 zerorpc bin;
3131
fi
32-
- nosetests -v
32+
- pytest -v

‎setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@
6464
url='https://github.com/0rpc/zerorpc-python',
6565
packages=['zerorpc'],
6666
install_requires=requirements,
67-
tests_require=['nose'],
68-
test_suite='nose.collector',
67+
tests_require=['pytest'],
68+
test_suite='pytest.collector',
6969
zip_safe=False,
7070
entry_points={'console_scripts': ['zerorpc = zerorpc.cli:main']},
7171
license='MIT',

‎tests/test_buffered_channel.py

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
from __future__ import absolute_import
2828
from builtins import range
2929

30-
from nose.tools import assert_raises
30+
import pytest
3131
import gevent
3232
import sys
3333

@@ -61,9 +61,9 @@ def test_close_server_bufchan():
6161
print('CLOSE SERVER SOCKET!!!')
6262
server_bufchan.close()
6363
if sys.version_info < (2, 7):
64-
assert_raises(zerorpc.LostRemote, client_bufchan.recv)
64+
pytest.raises(zerorpc.LostRemote, client_bufchan.recv)
6565
else:
66-
with assert_raises(zerorpc.LostRemote):
66+
with pytest.raises(zerorpc.LostRemote):
6767
client_bufchan.recv()
6868
print('CLIENT LOST SERVER :)')
6969
client_bufchan.close()
@@ -96,9 +96,9 @@ def test_close_client_bufchan():
9696
print('CLOSE CLIENT SOCKET!!!')
9797
client_bufchan.close()
9898
if sys.version_info < (2, 7):
99-
assert_raises(zerorpc.LostRemote, client_bufchan.recv)
99+
pytest.raises(zerorpc.LostRemote, client_bufchan.recv)
100100
else:
101-
with assert_raises(zerorpc.LostRemote):
101+
with pytest.raises(zerorpc.LostRemote):
102102
client_bufchan.recv()
103103
print('SERVER LOST CLIENT :)')
104104
server_bufchan.close()
@@ -129,9 +129,9 @@ def test_heartbeat_can_open_channel_server_close():
129129
print('CLOSE SERVER SOCKET!!!')
130130
server_bufchan.close()
131131
if sys.version_info < (2, 7):
132-
assert_raises(zerorpc.LostRemote, client_bufchan.recv)
132+
pytest.raises(zerorpc.LostRemote, client_bufchan.recv)
133133
else:
134-
with assert_raises(zerorpc.LostRemote):
134+
with pytest.raises(zerorpc.LostRemote):
135135
client_bufchan.recv()
136136
print('CLIENT LOST SERVER :)')
137137
client_bufchan.close()
@@ -170,9 +170,9 @@ def server_fn():
170170
client_bufchan.close()
171171
client.close()
172172
if sys.version_info < (2, 7):
173-
assert_raises(zerorpc.LostRemote, server_coro.get)
173+
pytest.raises(zerorpc.LostRemote, server_coro.get)
174174
else:
175-
with assert_raises(zerorpc.LostRemote):
175+
with pytest.raises(zerorpc.LostRemote):
176176
server_coro.get()
177177
print('SERVER LOST CLIENT :)')
178178
server.close()
@@ -244,9 +244,9 @@ def client_do():
244244
assert list(event.args) == [x + x * x]
245245
client_bufchan.emit('add', (x, x * x))
246246
if sys.version_info < (2, 7):
247-
assert_raises(zerorpc.LostRemote, client_bufchan.recv)
247+
pytest.raises(zerorpc.LostRemote, client_bufchan.recv)
248248
else:
249-
with assert_raises(zerorpc.LostRemote):
249+
with pytest.raises(zerorpc.LostRemote):
250250
client_bufchan.recv()
251251
client_bufchan.close()
252252

@@ -308,9 +308,9 @@ def server_do():
308308
server_bufchan.emit('OK', (sum(event.args),))
309309

310310
if sys.version_info < (2, 7):
311-
assert_raises(zerorpc.LostRemote, server_bufchan.recv)
311+
pytest.raises(zerorpc.LostRemote, server_bufchan.recv)
312312
else:
313-
with assert_raises(zerorpc.LostRemote):
313+
with pytest.raises(zerorpc.LostRemote):
314314
server_bufchan.recv()
315315
server_bufchan.close()
316316

@@ -343,9 +343,9 @@ def _do_with_assert_raises():
343343
event = client_bufchan.recv(timeout=TIME_FACTOR * 3)
344344
assert event.name == 'OK'
345345
assert list(event.args) == [x]
346-
assert_raises(zerorpc.TimeoutExpired, _do_with_assert_raises)
346+
pytest.raises(zerorpc.TimeoutExpired, _do_with_assert_raises)
347347
else:
348-
with assert_raises(zerorpc.TimeoutExpired):
348+
with pytest.raises(zerorpc.TimeoutExpired):
349349
for x in range(10):
350350
client_bufchan.emit('sleep', (x,))
351351
event = client_bufchan.recv(timeout=TIME_FACTOR * 3)
@@ -369,9 +369,9 @@ def _do_with_assert_raises():
369369
assert event.name == 'sleep'
370370
gevent.sleep(TIME_FACTOR * event.args[0])
371371
server_bufchan.emit('OK', event.args)
372-
assert_raises(zerorpc.LostRemote, _do_with_assert_raises)
372+
pytest.raises(zerorpc.LostRemote, _do_with_assert_raises)
373373
else:
374-
with assert_raises(zerorpc.LostRemote):
374+
with pytest.raises(zerorpc.LostRemote):
375375
for x in range(20):
376376
event = server_bufchan.recv()
377377
assert event.name == 'sleep'
@@ -422,19 +422,19 @@ def server_do():
422422
def _do_with_assert_raises():
423423
for x in range(200):
424424
server_bufchan.emit('coucou', x, timeout=0) # will fail when x == 1
425-
assert_raises(zerorpc.TimeoutExpired, _do_with_assert_raises)
425+
pytest.raises(zerorpc.TimeoutExpired, _do_with_assert_raises)
426426
else:
427-
with assert_raises(zerorpc.TimeoutExpired):
427+
with pytest.raises(zerorpc.TimeoutExpired):
428428
for x in range(200):
429429
server_bufchan.emit('coucou', x, timeout=0) # will fail when x == 1
430430
server_bufchan.emit('coucou', 1) # block until receiver is ready
431431
if sys.version_info < (2, 7):
432432
def _do_with_assert_raises():
433433
for x in range(2, 200):
434434
server_bufchan.emit('coucou', x, timeout=0) # will fail when x == 100
435-
assert_raises(zerorpc.TimeoutExpired, _do_with_assert_raises)
435+
pytest.raises(zerorpc.TimeoutExpired, _do_with_assert_raises)
436436
else:
437-
with assert_raises(zerorpc.TimeoutExpired):
437+
with pytest.raises(zerorpc.TimeoutExpired):
438438
for x in range(2, 200):
439439
server_bufchan.emit('coucou', x, timeout=0) # will fail when x == 100
440440
for x in range(read_cnt.value, 200):

‎tests/test_client_async.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
from __future__ import print_function
2727
from __future__ import absolute_import
28-
from nose.tools import assert_raises
28+
import pytest
2929
import gevent
3030
import sys
3131

@@ -58,9 +58,9 @@ def add(self, a, b):
5858
if sys.version_info < (2, 7):
5959
def _do_with_assert_raises():
6060
print(async_result.get())
61-
assert_raises(zerorpc.TimeoutExpired, _do_with_assert_raises)
61+
pytest.raises(zerorpc.TimeoutExpired, _do_with_assert_raises)
6262
else:
63-
with assert_raises(zerorpc.TimeoutExpired):
63+
with pytest.raises(zerorpc.TimeoutExpired):
6464
print(async_result.get())
6565
client.close()
6666
srv.close()

‎tests/test_heartbeat.py

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
from __future__ import absolute_import
2828
from builtins import range
2929

30-
from nose.tools import assert_raises
30+
import pytest
3131
import gevent
3232
import sys
3333

@@ -59,9 +59,9 @@ def test_close_server_hbchan():
5959
print('CLOSE SERVER SOCKET!!!')
6060
server_hbchan.close()
6161
if sys.version_info < (2, 7):
62-
assert_raises(zerorpc.LostRemote, client_hbchan.recv)
62+
pytest.raises(zerorpc.LostRemote, client_hbchan.recv)
6363
else:
64-
with assert_raises(zerorpc.LostRemote):
64+
with pytest.raises(zerorpc.LostRemote):
6565
client_hbchan.recv()
6666
print('CLIENT LOST SERVER :)')
6767
client_hbchan.close()
@@ -92,9 +92,9 @@ def test_close_client_hbchan():
9292
print('CLOSE CLIENT SOCKET!!!')
9393
client_hbchan.close()
9494
if sys.version_info < (2, 7):
95-
assert_raises(zerorpc.LostRemote, server_hbchan.recv)
95+
pytest.raises(zerorpc.LostRemote, server_hbchan.recv)
9696
else:
97-
with assert_raises(zerorpc.LostRemote):
97+
with pytest.raises(zerorpc.LostRemote):
9898
server_hbchan.recv()
9999
print('SERVER LOST CLIENT :)')
100100
server_hbchan.close()
@@ -123,9 +123,9 @@ def test_heartbeat_can_open_channel_server_close():
123123
print('CLOSE SERVER SOCKET!!!')
124124
server_hbchan.close()
125125
if sys.version_info < (2, 7):
126-
assert_raises(zerorpc.LostRemote, client_hbchan.recv)
126+
pytest.raises(zerorpc.LostRemote, client_hbchan.recv)
127127
else:
128-
with assert_raises(zerorpc.LostRemote):
128+
with pytest.raises(zerorpc.LostRemote):
129129
client_hbchan.recv()
130130
print('CLIENT LOST SERVER :)')
131131
client_hbchan.close()
@@ -155,9 +155,9 @@ def test_heartbeat_can_open_channel_client_close():
155155
client_hbchan.close()
156156
client.close()
157157
if sys.version_info < (2, 7):
158-
assert_raises(zerorpc.LostRemote, server_hbchan.recv)
158+
pytest.raises(zerorpc.LostRemote, server_hbchan.recv)
159159
else:
160-
with assert_raises(zerorpc.LostRemote):
160+
with pytest.raises(zerorpc.LostRemote):
161161
server_hbchan.recv()
162162
print('SERVER LOST CLIENT :)')
163163
server_hbchan.close()
@@ -227,9 +227,9 @@ def client_do():
227227
assert list(event.args) == [x + x * x]
228228
client_hbchan.emit('add', (x, x * x))
229229
if sys.version_info < (2, 7):
230-
assert_raises(zerorpc.LostRemote, client_hbchan.recv)
230+
pytest.raises(zerorpc.LostRemote, client_hbchan.recv)
231231
else:
232-
with assert_raises(zerorpc.LostRemote):
232+
with pytest.raises(zerorpc.LostRemote):
233233
client_hbchan.recv()
234234
client_hbchan.close()
235235

@@ -287,9 +287,9 @@ def server_do():
287287
server_hbchan.emit('OK', (sum(event.args),))
288288

289289
if sys.version_info < (2, 7):
290-
assert_raises(zerorpc.LostRemote, server_hbchan.recv)
290+
pytest.raises(zerorpc.LostRemote, server_hbchan.recv)
291291
else:
292-
with assert_raises(zerorpc.LostRemote):
292+
with pytest.raises(zerorpc.LostRemote):
293293
server_hbchan.recv()
294294
server_hbchan.close()
295295

@@ -322,9 +322,9 @@ def _do_with_assert_raises():
322322
event = client_hbchan.recv(timeout=TIME_FACTOR * 3)
323323
assert event.name == 'OK'
324324
assert list(event.args) == [x]
325-
assert_raises(zerorpc.TimeoutExpired, _do_with_assert_raises)
325+
pytest.raises(zerorpc.TimeoutExpired, _do_with_assert_raises)
326326
else:
327-
with assert_raises(zerorpc.TimeoutExpired):
327+
with pytest.raises(zerorpc.TimeoutExpired):
328328
for x in range(10):
329329
client_hbchan.emit('sleep', (x,))
330330
event = client_hbchan.recv(timeout=TIME_FACTOR * 3)
@@ -346,9 +346,9 @@ def _do_with_assert_raises():
346346
assert event.name == 'sleep'
347347
gevent.sleep(TIME_FACTOR * event.args[0])
348348
server_hbchan.emit('OK', event.args)
349-
assert_raises(zerorpc.LostRemote, _do_with_assert_raises)
349+
pytest.raises(zerorpc.LostRemote, _do_with_assert_raises)
350350
else:
351-
with assert_raises(zerorpc.LostRemote):
351+
with pytest.raises(zerorpc.LostRemote):
352352
for x in range(20):
353353
event = server_hbchan.recv()
354354
assert event.name == 'sleep'

‎tests/test_middleware.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
from builtins import str
2929
from future.utils import tobytes
3030

31-
from nose.tools import assert_raises
31+
import pytest
3232
import gevent
3333
import gevent.local
3434
import random
@@ -101,9 +101,9 @@ def hello(self):
101101

102102
srv = Srv(heartbeat=TIME_FACTOR * 1, context=c)
103103
if sys.version_info < (2, 7):
104-
assert_raises(zmq.ZMQError, srv.bind, 'some_service')
104+
pytest.raises(zmq.ZMQError, srv.bind, 'some_service')
105105
else:
106-
with assert_raises(zmq.ZMQError):
106+
with pytest.raises(zmq.ZMQError):
107107
srv.bind('some_service')
108108

109109
cnt = c.register_middleware(Resolver())

‎tests/test_server.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
from __future__ import absolute_import
2828
from builtins import range
2929

30-
from nose.tools import assert_raises
30+
import pytest
3131
import gevent
3232
import sys
3333

@@ -114,9 +114,9 @@ def add(self, a, b):
114114
client.connect(endpoint)
115115

116116
if sys.version_info < (2, 7):
117-
assert_raises(zerorpc.TimeoutExpired, client.add, 1, 4)
117+
pytest.raises(zerorpc.TimeoutExpired, client.add, 1, 4)
118118
else:
119-
with assert_raises(zerorpc.TimeoutExpired):
119+
with pytest.raises(zerorpc.TimeoutExpired):
120120
print(client.add(1, 4))
121121
client.close()
122122
srv.close()
@@ -140,9 +140,9 @@ def raise_something(self, a):
140140
if sys.version_info < (2, 7):
141141
def _do_with_assert_raises():
142142
print(client.raise_something(42))
143-
assert_raises(zerorpc.RemoteError, _do_with_assert_raises)
143+
pytest.raises(zerorpc.RemoteError, _do_with_assert_raises)
144144
else:
145-
with assert_raises(zerorpc.RemoteError):
145+
with pytest.raises(zerorpc.RemoteError):
146146
print(client.raise_something(42))
147147
assert client.raise_something(list(range(5))) == 4
148148
client.close()
@@ -167,9 +167,9 @@ def raise_error(self):
167167
if sys.version_info < (2, 7):
168168
def _do_with_assert_raises():
169169
print(client.raise_error())
170-
assert_raises(zerorpc.RemoteError, _do_with_assert_raises)
170+
pytest.raises(zerorpc.RemoteError, _do_with_assert_raises)
171171
else:
172-
with assert_raises(zerorpc.RemoteError):
172+
with pytest.raises(zerorpc.RemoteError):
173173
print(client.raise_error())
174174
try:
175175
client.raise_error()

‎tests/testutils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from builtins import str
2727

2828
import functools
29-
import nose.exc
29+
import pytest
3030
import random
3131
import os
3232

@@ -52,7 +52,7 @@ def skip(reason):
5252
def _skip(test):
5353
@functools.wraps(test)
5454
def wrap():
55-
raise nose.exc.SkipTest(reason)
55+
raise pytest.SkipTest(reason)
5656
return wrap
5757
return _skip
5858

‎tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ envlist = py26,py27,py34,py35
44
[testenv]
55
deps =
66
flake8
7-
nose
7+
pytest
88
commands =
99
flake8 zerorpc bin
10-
nosetests -v
10+
pytest -v
1111
passenv = ZPC_TEST_TIME_FACTOR
1212

1313
[flake8]

0 commit comments

Comments
 (0)