Author: Mark Williams <markrwilli...@gmail.com>
Branch: save_socket_errno
Changeset: r85346:decbd0844046
Date: 2016-06-22 22:10 -0700
http://bitbucket.org/pypy/pypy/changeset/decbd0844046/
Log: Remove spurious pytest import and ensure test runs correctly
diff --git a/rpython/rlib/test/test_rsocket.py
b/rpython/rlib/test/test_rsocket.py
--- a/rpython/rlib/test/test_rsocket.py
+++ b/rpython/rlib/test/test_rsocket.py
@@ -593,10 +593,11 @@
def test_socket_saves_errno(tmpdir):
# ensure errno is set to a known value...
unconnected_sock = RSocket()
- pytest.raises(CSocketError, unconnected_sock.recv, 1024)
+ e = py.test.raises(CSocketError, unconnected_sock.recv, 1024)
# ...which is ENOTCONN
assert e.value.errno == errno.ENOTCONN
- e = pytest.raises(CSocketError,
- RSocket, family=AF_INET, type=SOCK_STREAM, proto=SOL_UDP)
+ e = py.test.raises(CSocketError,
+ RSocket,
+ family=AF_INET, type=SOCK_STREAM, proto=SOL_UDP)
assert e.value.errno in (errno.EPROTOTYPE, errno.EPROTONOSUPPORT)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
