Skip to content

Commit dc1de51

Browse files
committed
removed remaining logger statements
1 parent 0f378e6 commit dc1de51

File tree

1 file changed

+9
-27
lines changed

1 file changed

+9
-27
lines changed

tests/test_ssl.py

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,6 @@
142142
)
143143
from .util import NON_ASCII, WARNING_TYPE_EXPECTED
144144

145-
logger = logging.getLogger(__name__)
146-
147145
# openssl dhparam 2048 -out dh-2048.pem
148146
dhparam = """\
149147
-----BEGIN DH PARAMETERS-----
@@ -482,19 +480,11 @@ def create_ssl_nonblocking_connection(
482480
requested_receive_buffer_size = request_send_buffer_size // 2
483481
client_socket.setsockopt(SOL_SOCKET, SO_SNDBUF, request_send_buffer_size)
484482
actual_sndbuf = client_socket.getsockopt(SOL_SOCKET, SO_SNDBUF)
485-
logger.debug(
486-
f"Attempted SO_SNDBUF: {request_send_buffer_size}, "
487-
f"Actual SO_SNDBUF: {actual_sndbuf}"
488-
)
489483

490484
server_socket.setsockopt(
491485
SOL_SOCKET, SO_RCVBUF, requested_receive_buffer_size
492486
)
493487
actual_rcvbuf = server_socket.getsockopt(SOL_SOCKET, SO_RCVBUF)
494-
logger.debug(
495-
f"Attempted SO_RCVBUF: {requested_receive_buffer_size}, "
496-
f"Actual SO_RCVBUF: {actual_rcvbuf}"
497-
)
498488

499489
# set the connection state
500490
client.set_connect_state()
@@ -3135,9 +3125,7 @@ def _attempt_want_write_error(
31353125
)
31363126
return msg
31373127

3138-
def _drain_server_buffers(
3139-
self, server: Connection
3140-
) -> None:
3128+
def _drain_server_buffers(self, server: Connection) -> None:
31413129
"""Reads from server SSL and raw sockets to drain any pending data."""
31423130
total_ssl_read = 0
31433131
consecutive_empty_ssl_reads = 0
@@ -3168,11 +3156,8 @@ def _perform_moving_buffer_test(
31683156
'bad write retry' error.
31693157
Returns True if 'bad write retry' occurs, False otherwise.
31703158
"""
3171-
logger.debug("Phase 3: Performing moving buffer retry test")
3172-
31733159
# Attempt retry with different buffer but same size
31743160
msg2 = b"Z" * buffer_size
3175-
logger.debug(f"buffer location for msg2 is {id(msg2):#x}")
31763161
try:
31773162
bytes_written = client.send(msg2)
31783163
assert not want_bad_retry, (
@@ -3185,7 +3170,6 @@ def _perform_moving_buffer_test(
31853170
assert reason == "bad write retry", (
31863171
f"Retry failed with unexpected SSL error: {e!r}({reason})."
31873172
)
3188-
logger.debug(f"Got SSL error: {e!r} ({reason}).")
31893173
return True # Bad write retry
31903174

31913175
def _shutdown_connections(
@@ -3220,8 +3204,8 @@ def ssl_connection_setup(self, request):
32203204
request_buffer_size = request.param.get("request_buffer_size")
32213205
modeflag = request.param.get("modeflag")
32223206

3223-
client, server, sndbuf, rcvbuf = (
3224-
create_ssl_nonblocking_connection(modeflag, request_buffer_size)
3207+
client, server, sndbuf, rcvbuf = create_ssl_nonblocking_connection(
3208+
modeflag, request_buffer_size
32253209
)
32263210
# Use a buffer size that is half the size
32273211
# of the allocated socket buffers
@@ -3236,9 +3220,7 @@ def ssl_connection_setup(self, request):
32363220
)
32373221

32383222
# Teardown: Clean up the connections after the test finishes
3239-
self._shutdown_connections(
3240-
client, server
3241-
)
3223+
self._shutdown_connections(client, server)
32423224

32433225
@pytest.mark.parametrize(
32443226
"ssl_connection_setup",
@@ -3258,11 +3240,11 @@ def ssl_connection_setup(self, request):
32583240
)
32593241
def test_moving_buffer_behavior(self, ssl_connection_setup):
32603242
"""Tests for possible "bad write retry" errors over an SSL connection.
3261-
If an SSL connection partially processes some data,
3262-
and then hits an `OpenSSL.SSL.WantWriteError`,
3263-
the connection may expect a retry. When PyOpenSSL creates
3264-
a new connection object, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER is
3265-
applied by default. This mode allows for data to be sent from a
3243+
If an SSL connection partially processes some data,
3244+
and then hits an `OpenSSL.SSL.WantWriteError`,
3245+
the connection may expect a retry. When PyOpenSSL creates
3246+
a new connection object, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER is
3247+
applied by default. This mode allows for data to be sent from a
32663248
different buffer location, something that may happen if Python moves a
32673249
mutable object such as a bytearray as part of its memory management.
32683250
If the mode is turned off, OpenSSL will reject the resend with

0 commit comments

Comments
 (0)