Skip to content

Commit 4b42b89

Browse files
committed
removed some code with pragma no covers
1 parent dd61474 commit 4b42b89

File tree

1 file changed

+16
-35
lines changed

1 file changed

+16
-35
lines changed

tests/test_ssl.py

Lines changed: 16 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3124,12 +3124,8 @@ def _attempt_want_write_error(
31243124
)
31253125
initial_want_write_triggered = True
31263126
break # Exit loop as desired error was triggered
3127-
except Exception as e: # pragma: no cover
3128-
error_string = str(e)
3129-
logger.debug(f"Attempt {i} failed with error: {error_string}")
31303127

3131-
if not initial_want_write_triggered:
3132-
pytest.fail("Could not induce WantWriteError") # pragma: no cover
3128+
assert initial_want_write_triggered, "Could not induce WantWriteError"
31333129

31343130
return msg
31353131

@@ -3138,6 +3134,7 @@ def _drain_server_buffers(
31383134
) -> None:
31393135
"""Reads from server SSL and raw sockets to drain any pending data."""
31403136
logger.debug("--- Phase 2: Draining server buffers ---")
3137+
31413138
total_ssl_read = 0
31423139
consecutive_empty_ssl_reads = 0
31433140

@@ -3171,17 +3168,9 @@ def _drain_server_buffers(
31713168
)
31723169
time.sleep(0.01) # Small delay for non-blocking SSL reads
31733170

3174-
except SSL.Error as ssl_error:
3175-
logger.debug(f"SSL error during drain: {ssl_error}")
3176-
break # Stop on SSL protocol errors
3177-
except Exception as e: # Catch other potential errors
3178-
logger.error(f"Unexpected error during SSL drain: {e}")
3179-
break
3180-
3181-
logger.debug(f"Finished draining SSL. Bytes read: {total_ssl_read}.")
3182-
3183-
# Allow network buffers to settle
3184-
time.sleep(0.1)
3171+
logger.debug(
3172+
f"Finished reading from server. Bytes read: {total_ssl_read}. "
3173+
)
31853174

31863175
def _perform_moving_buffer_test(
31873176
self, client: Connection, buffer_size: int, want_bad_retry: bool
@@ -3195,27 +3184,21 @@ def _perform_moving_buffer_test(
31953184

31963185
# Attempt retry with different buffer but same size
31973186
msg2 = b"Z" * buffer_size
3198-
logger.debug(f"buffer location for msg3 is {id(msg2):#x}")
3187+
logger.debug(f"buffer location for msg2 is {id(msg2):#x}")
31993188
try:
32003189
bytes_written = client.send(msg2)
3201-
if want_bad_retry:
3202-
logger.debug(
3203-
"_perform_moving_buffer_test() failed as retry succeeded "
3204-
f"unexpectedly with {bytes_written} bytes written."
3205-
) # pragma: no cover
3190+
assert not want_bad_retry, (
3191+
"_perform_moving_buffer_test() failed as retry succeeded "
3192+
f"unexpectedly with {bytes_written} bytes written."
3193+
)
32063194
return False # Retry succeeded
32073195
except SSL.Error as e:
32083196
reason = get_ssl_error_reason(e)
3209-
if reason == "bad write retry":
3210-
logger.debug(f"Got SSL error: {e!r} ({reason}).")
3211-
return True # Bad write retry
3212-
else:
3213-
logger.debug(f"Got SSL error: {e!r} ({reason}).")
3214-
pytest.fail(
3215-
f"Retry failed with unexpected SSL error: {e!r} "
3216-
f"({reason})."
3217-
) # pragma: no cover
3218-
# If any other exception occurs, it will propagate up
3197+
assert reason == "bad write retry", (
3198+
f"Retry failed with unexpected SSL error: {e!r}({reason})."
3199+
)
3200+
logger.debug(f"Got SSL error: {e!r} ({reason}).")
3201+
return True # Bad write retry
32193202

32203203
def _shutdown_connections(
32213204
self,
@@ -3242,7 +3225,6 @@ def _shutdown_connections(
32423225
client_socket.close()
32433226
if server_socket:
32443227
server_socket.close()
3245-
# Connections closed.
32463228

32473229
def _badwriteretry(
32483230
self,
@@ -3264,7 +3246,7 @@ def _badwriteretry(
32643246
create_ssl_nonblocking_connection(modeflag, request_buffer_size)
32653247
)
32663248
result = False # Default return value
3267-
# set buffer size to the minimum of send and receive buffers
3249+
# set buffer size to half the minimum of send and receive buffers
32683250
buffer_size = min(sndbuf, rcvbuf) // 2
32693251

32703252
# --- Main Test Flow ---
@@ -3286,7 +3268,6 @@ def _badwriteretry(
32863268
self._shutdown_connections(
32873269
client, server, client_socket, server_socket
32883270
)
3289-
32903271
return result
32913272

32923273
def test_moving_write_buffer_should_pass(self) -> None:

0 commit comments

Comments
 (0)