Skip to content

Commit 809dd22

Browse files
committed
Simplify transport error test by removing unnecessary pipe_fd fixture
fileno() is never called on the server socket when accept() raises, so the pipe file descriptor and its fixture were unnecessary.
1 parent 6a2809c commit 809dd22

1 file changed

Lines changed: 14 additions & 29 deletions

File tree

cheroot/test/test_ssl.py

Lines changed: 14 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,25 +1224,11 @@ def conn_manager_with_server(mocker):
12241224
return mgr
12251225

12261226

1227-
@contextlib.contextmanager
1228-
def pipe_fd():
1229-
"""Open an OS pipe and ensure both ends are closed."""
1230-
read_fd, write_fd = os.pipe()
1231-
try:
1232-
yield read_fd
1233-
finally:
1234-
os.close(read_fd)
1235-
os.close(write_fd)
1236-
1237-
1238-
def _make_fake_socket(error, read_fd):
1227+
def _make_fake_socket(error):
12391228
def _accept(): # noqa: WPS430
12401229
raise error
12411230

1242-
return SimpleNamespace(
1243-
accept=_accept,
1244-
fileno=lambda: read_fd,
1245-
)
1231+
return SimpleNamespace(accept=_accept)
12461232

12471233

12481234
@pytest.mark.parametrize(
@@ -1262,20 +1248,19 @@ def test_from_server_socket_transport_errors(
12621248
expected_exception,
12631249
):
12641250
"""Test errors raised during initial socket accept are handled correctly."""
1265-
with pipe_fd() as read_fd:
1266-
fake_socket = _make_fake_socket(error, read_fd)
1251+
fake_socket = _make_fake_socket(error)
12671252

1268-
if expected_exception:
1269-
with pytest.raises(
1270-
expected_exception,
1271-
match='Critical kernel error',
1272-
):
1273-
conn_manager_with_server._from_server_socket(fake_socket)
1274-
else:
1275-
assert (
1276-
conn_manager_with_server._from_server_socket(fake_socket)
1277-
is None
1278-
)
1253+
if expected_exception:
1254+
with pytest.raises(
1255+
expected_exception,
1256+
match='Critical kernel error',
1257+
):
1258+
conn_manager_with_server._from_server_socket(fake_socket)
1259+
else:
1260+
assert (
1261+
conn_manager_with_server._from_server_socket(fake_socket)
1262+
is None
1263+
)
12791264

12801265

12811266
def _make_connection(

0 commit comments

Comments
 (0)