From 78bfe273314900216322c8cd9adfc57bed5ea858 Mon Sep 17 00:00:00 2001 From: Roger Light Date: Sun, 19 Apr 2026 23:42:16 +0100 Subject: [PATCH] Tests: Add valid disconnect exceptions on Windows --- test/broker/01-connect-global-max-connections.py | 4 ++-- test/broker/01-connect-max-connections.py | 2 +- test/lib/msg_sequence_test.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/broker/01-connect-global-max-connections.py b/test/broker/01-connect-global-max-connections.py index 0e1bcddc..1c6805bf 100755 --- a/test/broker/01-connect-global-max-connections.py +++ b/test/broker/01-connect-global-max-connections.py @@ -38,7 +38,7 @@ def do_test(): mosq_test.do_client_connect(connect_packet_bad, connack_packet_bad, port=port) print("did not throw when trying to open 11th connection (first time)") return rc - except (ConnectionResetError, BrokenPipeError, OSError): + except (ConnectionAbortedError, ConnectionResetError, BrokenPipeError, OSError): # Expected behaviour pass finally: @@ -61,7 +61,7 @@ def do_test(): mosq_test.do_client_connect(connect_packet_bad, connack_packet_bad, port=port) print("did not throw when trying to open 11th connection (second time)") return rc - except (ConnectionResetError, BrokenPipeError, OSError): + except (ConnectionAbortedError, ConnectionResetError, BrokenPipeError, OSError): # Expected behaviour pass finally: diff --git a/test/broker/01-connect-max-connections.py b/test/broker/01-connect-max-connections.py index 4d1b8733..80772cd0 100755 --- a/test/broker/01-connect-max-connections.py +++ b/test/broker/01-connect-max-connections.py @@ -20,7 +20,7 @@ def test_iteration(port, connect_packets_ok, connack_packets_ok, connect_packet_ # Try to open an 11th connection try: sock_bad = mosq_test.do_client_connect(connect_packet_bad, connack_packet_bad, port=port) - except (ConnectionResetError, BrokenPipeError): + except (ConnectionAbortedError, ConnectionResetError, BrokenPipeError): # Expected behaviour pass except OSError as e: diff --git a/test/lib/msg_sequence_test.py b/test/lib/msg_sequence_test.py index f82087cb..65e1daf1 100755 --- a/test/lib/msg_sequence_test.py +++ b/test/lib/msg_sequence_test.py @@ -158,7 +158,7 @@ class MsgSequence(object): try: if self._puback_check() and self.expect_disconnect: raise ValueError("Still connected") - except ConnectionResetError: + except (ConnectionAbortedError, ConnectionResetError): if self.expect_disconnect: pass else: