diff --git a/test/broker/01-connect-anon-denied.py b/test/broker/01-connect-anon-denied.py index 1649e7f8..86649207 100755 --- a/test/broker/01-connect-anon-denied.py +++ b/test/broker/01-connect-anon-denied.py @@ -31,6 +31,8 @@ def do_test(proto_ver): sock = mosq_test.do_client_connect(connect_packet, connack_packet, port=port) sock.close() rc = 0 + except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/01-connect-bad-packet.py b/test/broker/01-connect-bad-packet.py index 8b377596..8d3506b7 100755 --- a/test/broker/01-connect-bad-packet.py +++ b/test/broker/01-connect-bad-packet.py @@ -26,6 +26,8 @@ def do_test(proto_ver): if e.errno == errno.ECONNRESET: # Connection has been closed by peer, this is the expected behaviour rc = 0 + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/01-connect-disconnect-v5.py b/test/broker/01-connect-disconnect-v5.py index 5486fdf6..0f677573 100755 --- a/test/broker/01-connect-disconnect-v5.py +++ b/test/broker/01-connect-disconnect-v5.py @@ -55,6 +55,8 @@ try: props = mqtt5_props.gen_string_pair_prop(mqtt5_props.PROP_USER_PROPERTY, "key", "value") disconnect_packet = mosq_test.gen_disconnect(proto_ver=5, reason_code=0, properties=props) disco_test("disco len>2", disconnect_packet) +except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/01-connect-duplicate.py b/test/broker/01-connect-duplicate.py index 5d5d630e..70ec7d2c 100755 --- a/test/broker/01-connect-duplicate.py +++ b/test/broker/01-connect-duplicate.py @@ -22,6 +22,8 @@ def do_test(proto_ver): rc = 0 except socket.error: rc = 0 + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/01-connect-invalid-id-0.py b/test/broker/01-connect-invalid-id-0.py index 83eab86e..2ef6556b 100755 --- a/test/broker/01-connect-invalid-id-0.py +++ b/test/broker/01-connect-invalid-id-0.py @@ -20,6 +20,8 @@ def do_test(proto_ver): sock = mosq_test.do_client_connect(connect_packet, connack_packet, port=port) sock.close() rc = 0 + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/01-connect-invalid-id-missing.py b/test/broker/01-connect-invalid-id-missing.py index eeac39f1..8e46a6c5 100755 --- a/test/broker/01-connect-invalid-id-missing.py +++ b/test/broker/01-connect-invalid-id-missing.py @@ -16,6 +16,8 @@ try: sock = mosq_test.do_client_connect(connect_packet, connack_packet, port=port) sock.close() rc = 0 +except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/01-connect-invalid-id-utf8.py b/test/broker/01-connect-invalid-id-utf8.py index 1f6dd2e9..cce4c9c8 100755 --- a/test/broker/01-connect-invalid-id-utf8.py +++ b/test/broker/01-connect-invalid-id-utf8.py @@ -22,6 +22,8 @@ def do_test(proto_ver): # Exception occurs if connack packet returned rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/01-connect-invalid-protonum.py b/test/broker/01-connect-invalid-protonum.py index 348b39fb..22d6d186 100755 --- a/test/broker/01-connect-invalid-protonum.py +++ b/test/broker/01-connect-invalid-protonum.py @@ -17,6 +17,8 @@ try: sock.close() rc = 0 +except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/01-connect-invalid-reserved.py b/test/broker/01-connect-invalid-reserved.py index 1aa35131..7e2e2ace 100755 --- a/test/broker/01-connect-invalid-reserved.py +++ b/test/broker/01-connect-invalid-reserved.py @@ -19,6 +19,8 @@ except socket.error as e: if e.errno == errno.ECONNRESET: # Connection has been closed by peer, this is the expected behaviour rc = 0 +except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/01-connect-success.py b/test/broker/01-connect-success.py index 8dadbadc..dde9ca1e 100755 --- a/test/broker/01-connect-success.py +++ b/test/broker/01-connect-success.py @@ -17,6 +17,8 @@ def do_test(proto_ver): sock = mosq_test.do_client_connect(connect_packet, connack_packet, port=port) sock.close() rc = 0 + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/01-connect-uname-invalid-utf8.py b/test/broker/01-connect-uname-invalid-utf8.py index 80d53baf..ddf1461b 100755 --- a/test/broker/01-connect-uname-invalid-utf8.py +++ b/test/broker/01-connect-uname-invalid-utf8.py @@ -22,6 +22,8 @@ def do_test(proto_ver): # Exception occurs if connack packet returned rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/01-connect-uname-no-flag.py b/test/broker/01-connect-uname-no-flag.py index 700acde0..f9abd117 100755 --- a/test/broker/01-connect-uname-no-flag.py +++ b/test/broker/01-connect-uname-no-flag.py @@ -22,6 +22,8 @@ def do_test(proto_ver): sock = mosq_test.do_client_connect(connect_packet, b"", port=port) sock.close() rc = 0 + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/01-connect-uname-no-password-denied.py b/test/broker/01-connect-uname-no-password-denied.py index 0f01e905..b5382405 100755 --- a/test/broker/01-connect-uname-no-password-denied.py +++ b/test/broker/01-connect-uname-no-password-denied.py @@ -31,6 +31,8 @@ def do_test(proto_ver): sock = mosq_test.do_client_connect(connect_packet, connack_packet, port=port) sock.close() rc = 0 + except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/01-connect-uname-password-denied-no-will.py b/test/broker/01-connect-uname-password-denied-no-will.py index 8a2b0f9c..a9ce214e 100755 --- a/test/broker/01-connect-uname-password-denied-no-will.py +++ b/test/broker/01-connect-uname-password-denied-no-will.py @@ -53,6 +53,8 @@ def do_test(proto_ver): sock1.close() rc = 0 + except mosq_test.TestError: + pass finally: os.remove(conf_file) os.remove(pw_file) diff --git a/test/broker/01-connect-uname-password-denied.py b/test/broker/01-connect-uname-password-denied.py index fe165045..989d5789 100755 --- a/test/broker/01-connect-uname-password-denied.py +++ b/test/broker/01-connect-uname-password-denied.py @@ -33,6 +33,8 @@ def do_test(proto_ver): sock.close() rc = 0 + except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/01-connect-uname-password-success-no-tls.py b/test/broker/01-connect-uname-password-success-no-tls.py index 920470d7..27c09c11 100755 --- a/test/broker/01-connect-uname-password-success-no-tls.py +++ b/test/broker/01-connect-uname-password-success-no-tls.py @@ -29,6 +29,8 @@ def do_test(proto_ver): sock.close() rc = 0 + except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/01-connect-uname-password-success.py b/test/broker/01-connect-uname-password-success.py index 920470d7..27c09c11 100755 --- a/test/broker/01-connect-uname-password-success.py +++ b/test/broker/01-connect-uname-password-success.py @@ -29,6 +29,8 @@ def do_test(proto_ver): sock.close() rc = 0 + except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/01-connect-uname-pwd-no-flag.py b/test/broker/01-connect-uname-pwd-no-flag.py index 1950cd80..ce444441 100755 --- a/test/broker/01-connect-uname-pwd-no-flag.py +++ b/test/broker/01-connect-uname-pwd-no-flag.py @@ -23,6 +23,8 @@ def do_test(proto_ver): sock = mosq_test.do_client_connect(connect_packet, b"", port=port) sock.close() rc = 0 + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/01-connect-zero-length-id.py b/test/broker/01-connect-zero-length-id.py index 370199ab..8ad4721d 100755 --- a/test/broker/01-connect-zero-length-id.py +++ b/test/broker/01-connect-zero-length-id.py @@ -47,6 +47,8 @@ def do_test(per_listener, proto_ver, clean_start, allow_zero, client_port, expec sock = mosq_test.do_client_connect(connect_packet, connack_packet, port=client_port) sock.close() rc = 0 + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-shared-qos0-v5.py b/test/broker/02-shared-qos0-v5.py index eaebcb20..e05f86f6 100755 --- a/test/broker/02-shared-qos0-v5.py +++ b/test/broker/02-shared-qos0-v5.py @@ -94,33 +94,35 @@ try: mosq_test.do_send_receive(sock5, subscribe5_packet, suback5_packet, "suback5") sock1.send(publish1_packet) - if mosq_test.expect_packet(sock1, "publish1 1", publish1_packet): - if mosq_test.expect_packet(sock2, "publish1 2", publish1_packet): - if mosq_test.expect_packet(sock3, "publish1 3", publish1_packet): + mosq_test.expect_packet(sock1, "publish1 1", publish1_packet) + mosq_test.expect_packet(sock2, "publish1 2", publish1_packet) + mosq_test.expect_packet(sock3, "publish1 3", publish1_packet) - sock1.send(publish2_packet) - if mosq_test.expect_packet(sock1, "publish2 1", publish2_packet): - if mosq_test.expect_packet(sock3, "publish2 3", publish2_packet): - if mosq_test.expect_packet(sock4, "publish2 4", publish2_packet): + sock1.send(publish2_packet) + mosq_test.expect_packet(sock1, "publish2 1", publish2_packet) + mosq_test.expect_packet(sock3, "publish2 3", publish2_packet) + mosq_test.expect_packet(sock4, "publish2 4", publish2_packet) - sock1.send(publish3_packet) - if mosq_test.expect_packet(sock1, "publish3 1", publish3_packet): - if mosq_test.expect_packet(sock3, "publish3 3", publish3_packet): - if mosq_test.expect_packet(sock5, "publish3 5", publish3_packet): - mosq_test.do_send_receive(sock1, unsubscribe1_packet, unsuback1_packet, "unsuback1") - mosq_test.do_send_receive(sock2, unsubscribe2_packet, unsuback2_packet, "unsuback2") - mosq_test.do_send_receive(sock3, unsubscribe3a_packet, unsuback3a_packet, "unsuback3a") - mosq_test.do_send_receive(sock3, unsubscribe3b_packet, unsuback3b_packet, "unsuback3b") - mosq_test.do_send_receive(sock4, unsubscribe4_packet, unsuback4_packet, "unsuback4") - mosq_test.do_send_receive(sock5, unsubscribe5_packet, unsuback5_packet, "unsuback5") + sock1.send(publish3_packet) + mosq_test.expect_packet(sock1, "publish3 1", publish3_packet) + mosq_test.expect_packet(sock3, "publish3 3", publish3_packet) + mosq_test.expect_packet(sock5, "publish3 5", publish3_packet) + mosq_test.do_send_receive(sock1, unsubscribe1_packet, unsuback1_packet, "unsuback1") + mosq_test.do_send_receive(sock2, unsubscribe2_packet, unsuback2_packet, "unsuback2") + mosq_test.do_send_receive(sock3, unsubscribe3a_packet, unsuback3a_packet, "unsuback3a") + mosq_test.do_send_receive(sock3, unsubscribe3b_packet, unsuback3b_packet, "unsuback3b") + mosq_test.do_send_receive(sock4, unsubscribe4_packet, unsuback4_packet, "unsuback4") + mosq_test.do_send_receive(sock5, unsubscribe5_packet, unsuback5_packet, "unsuback5") - rc = 0 + rc = 0 sock1.close() sock2.close() sock3.close() sock4.close() sock5.close() +except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-subhier-crash.py b/test/broker/02-subhier-crash.py index 9a3c267c..f24a330c 100755 --- a/test/broker/02-subhier-crash.py +++ b/test/broker/02-subhier-crash.py @@ -46,6 +46,8 @@ try: rc = 0 +except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-subpub-qos0-long-topic.py b/test/broker/02-subpub-qos0-long-topic.py index 603f504e..5f385a60 100755 --- a/test/broker/02-subpub-qos0-long-topic.py +++ b/test/broker/02-subpub-qos0-long-topic.py @@ -31,6 +31,8 @@ def do_test(topic, succeeds): rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-subpub-qos0-retain-as-publish.py b/test/broker/02-subpub-qos0-retain-as-publish.py index a22819f0..cb1f8592 100755 --- a/test/broker/02-subpub-qos0-retain-as-publish.py +++ b/test/broker/02-subpub-qos0-retain-as-publish.py @@ -43,6 +43,8 @@ def do_test(): rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-subpub-qos0-send-retain.py b/test/broker/02-subpub-qos0-send-retain.py index b25a85e8..177cdc2c 100755 --- a/test/broker/02-subpub-qos0-send-retain.py +++ b/test/broker/02-subpub-qos0-send-retain.py @@ -53,19 +53,21 @@ def do_test(): # Expect a message after this, because it is the first subscribe mosq_test.do_send_receive(sock, subscribe2_packet, suback2_packet, "suback2") - if mosq_test.expect_packet(sock, "publish2r1", publish2r1_packet): - # Don't expect a message after this, it is the second subscribe - mosq_test.do_send_receive(sock, subscribe2_packet, suback2_packet, "suback2") + mosq_test.expect_packet(sock, "publish2r1", publish2r1_packet) + # Don't expect a message after this, it is the second subscribe + mosq_test.do_send_receive(sock, subscribe2_packet, suback2_packet, "suback2") - # Always expect a message after this - mosq_test.do_send_receive(sock, subscribe1_packet, suback1_packet, "suback1") - if mosq_test.expect_packet(sock, "publish1r1", publish1r1_packet): - # Always expect a message after this - mosq_test.do_send_receive(sock, subscribe1_packet, suback1_packet, "suback1") - if mosq_test.expect_packet(sock, "publish1r1", publish1r2_packet): - rc = 0 + # Always expect a message after this + mosq_test.do_send_receive(sock, subscribe1_packet, suback1_packet, "suback1") + mosq_test.expect_packet(sock, "publish1r1", publish1r1_packet) + # Always expect a message after this + mosq_test.do_send_receive(sock, subscribe1_packet, suback1_packet, "suback1") + mosq_test.expect_packet(sock, "publish1r1", publish1r2_packet) + rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-subpub-qos0-subscription-id.py b/test/broker/02-subpub-qos0-subscription-id.py index 33f438f4..4faf8ca6 100755 --- a/test/broker/02-subpub-qos0-subscription-id.py +++ b/test/broker/02-subpub-qos0-subscription-id.py @@ -93,6 +93,8 @@ def do_test(proto_ver): rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-subpub-qos0-topic-alias-unknown.py b/test/broker/02-subpub-qos0-topic-alias-unknown.py index 22a8a1dd..cdce33ce 100755 --- a/test/broker/02-subpub-qos0-topic-alias-unknown.py +++ b/test/broker/02-subpub-qos0-topic-alias-unknown.py @@ -23,10 +23,12 @@ def do_test(): sock = mosq_test.do_client_connect(connect_packet, connack_packet, timeout=5, port=port) sock.send(publish1_packet) - if mosq_test.expect_packet(sock, "disconnect", disconnect_packet): - rc = 0 + mosq_test.expect_packet(sock, "disconnect", disconnect_packet) + rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-subpub-qos0-topic-alias.py b/test/broker/02-subpub-qos0-topic-alias.py index c86f66d1..3e950060 100755 --- a/test/broker/02-subpub-qos0-topic-alias.py +++ b/test/broker/02-subpub-qos0-topic-alias.py @@ -39,11 +39,13 @@ def do_test(): sock1.send(publish2s_packet) - if mosq_test.expect_packet(sock2, "publish2r", publish2r_packet): - rc = 0 + mosq_test.expect_packet(sock2, "publish2r", publish2r_packet) + rc = 0 sock1.close() sock2.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-subpub-qos0.py b/test/broker/02-subpub-qos0.py index e50283cb..00983404 100755 --- a/test/broker/02-subpub-qos0.py +++ b/test/broker/02-subpub-qos0.py @@ -28,6 +28,8 @@ def do_test(proto_ver): rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-subpub-qos1-bad-pubcomp.py b/test/broker/02-subpub-qos1-bad-pubcomp.py index e620ed9a..8fbdfdd8 100755 --- a/test/broker/02-subpub-qos1-bad-pubcomp.py +++ b/test/broker/02-subpub-qos1-bad-pubcomp.py @@ -47,18 +47,20 @@ def do_test(proto_ver): helper(port, proto_ver) - if mosq_test.expect_packet(sock, "publish 1r", publish1r_packet): - sock.send(pubcomp1r_packet) - sock.send(pingreq_packet) - p = sock.recv(len(pingresp_packet)) - if len(p) == 0: - rc = 0 + mosq_test.expect_packet(sock, "publish 1r", publish1r_packet) + sock.send(pubcomp1r_packet) + sock.send(pingreq_packet) + p = sock.recv(len(pingresp_packet)) + if len(p) == 0: + rc = 0 sock.close() except socket.error as e: if e.errno == errno.ECONNRESET: # Connection has been closed by peer, this is the expected behaviour rc = 0 + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-subpub-qos1-bad-pubrec.py b/test/broker/02-subpub-qos1-bad-pubrec.py index af181f03..008da1ba 100755 --- a/test/broker/02-subpub-qos1-bad-pubrec.py +++ b/test/broker/02-subpub-qos1-bad-pubrec.py @@ -44,18 +44,20 @@ def do_test(proto_ver): helper(port, proto_ver) - if mosq_test.expect_packet(sock, "publish 1r", publish1r_packet): - sock.send(pubrec1r_packet) - sock.send(pingreq_packet) - p = sock.recv(len(pingresp_packet)) - if len(p) == 0: - rc = 0 + mosq_test.expect_packet(sock, "publish 1r", publish1r_packet) + sock.send(pubrec1r_packet) + sock.send(pingreq_packet) + p = sock.recv(len(pingresp_packet)) + if len(p) == 0: + rc = 0 sock.close() except socket.error as e: if e.errno == errno.ECONNRESET: # Connection has been closed by peer, this is the expected behaviour rc = 0 + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-subpub-qos1-message-expiry-retain.py b/test/broker/02-subpub-qos1-message-expiry-retain.py index 24545a5e..3e758219 100755 --- a/test/broker/02-subpub-qos1-message-expiry-retain.py +++ b/test/broker/02-subpub-qos1-message-expiry-retain.py @@ -56,26 +56,27 @@ def do_test(): sock = mosq_test.do_client_connect(connect_packet, connack_packet, timeout=20, port=port) mosq_test.do_send_receive(sock, subscribe1_packet, suback1_packet, "suback 1-1") - if mosq_test.expect_packet(sock, "publish 1", publish1_packet): - sock.send(puback1_packet) + mosq_test.expect_packet(sock, "publish 1", publish1_packet) + sock.send(puback1_packet) - mosq_test.do_send_receive(sock, subscribe2_packet, suback2_packet, "suback 2-1") - if mosq_test.expect_packet(sock, "publish 2", publish2s_packet): - sock.send(puback2s_packet) + mosq_test.do_send_receive(sock, subscribe2_packet, suback2_packet, "suback 2-1") + mosq_test.expect_packet(sock, "publish 2", publish2s_packet) + sock.send(puback2s_packet) + sock.close() - sock.close() - - time.sleep(5) - sock = mosq_test.do_client_connect(connect_packet, connack_packet, timeout=20, port=port) - mosq_test.do_send_receive(sock, subscribe1_packet, suback1_packet, "suback 1-2") - # We shouldn't receive a publish here - # This will fail if we do receive a publish - mosq_test.do_send_receive(sock, subscribe2_packet, suback2_packet, "suback 2-2") - if mosq_test.expect_packet(sock, "publish 2", publish2r_packet): - sock.send(puback2r_packet) - sock.close() - rc = 0 + time.sleep(5) + sock = mosq_test.do_client_connect(connect_packet, connack_packet, timeout=20, port=port) + mosq_test.do_send_receive(sock, subscribe1_packet, suback1_packet, "suback 1-2") + # We shouldn't receive a publish here + # This will fail if we do receive a publish + mosq_test.do_send_receive(sock, subscribe2_packet, suback2_packet, "suback 2-2") + mosq_test.expect_packet(sock, "publish 2", publish2r_packet) + sock.send(puback2r_packet) + sock.close() + rc = 0 + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-subpub-qos1-message-expiry-will.py b/test/broker/02-subpub-qos1-message-expiry-will.py index b2b1f380..3ca26d05 100755 --- a/test/broker/02-subpub-qos1-message-expiry-will.py +++ b/test/broker/02-subpub-qos1-message-expiry-will.py @@ -56,6 +56,8 @@ def do_test(): break sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-subpub-qos1-message-expiry.py b/test/broker/02-subpub-qos1-message-expiry.py index 90079576..554941c1 100755 --- a/test/broker/02-subpub-qos1-message-expiry.py +++ b/test/broker/02-subpub-qos1-message-expiry.py @@ -63,6 +63,8 @@ def do_test(): break sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-subpub-qos1-nolocal.py b/test/broker/02-subpub-qos1-nolocal.py index e2d18045..d2397879 100755 --- a/test/broker/02-subpub-qos1-nolocal.py +++ b/test/broker/02-subpub-qos1-nolocal.py @@ -44,10 +44,12 @@ def do_test(): mosq_test.do_send_receive(sock, publish_packet, puback_packet, "puback") mosq_test.do_send_receive(sock, publish2_packet, puback2_packet, "puback2") - if mosq_test.expect_packet(sock, "publish3", publish3_packet): - rc = 0 + mosq_test.expect_packet(sock, "publish3", publish3_packet) + rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-subpub-qos1.py b/test/broker/02-subpub-qos1.py index a32fa6e3..e45abe7a 100755 --- a/test/broker/02-subpub-qos1.py +++ b/test/broker/02-subpub-qos1.py @@ -32,10 +32,12 @@ def do_test(proto_ver): mosq_test.do_send_receive(sock, publish_packet, puback_packet, "puback") - if mosq_test.expect_packet(sock, "publish2", publish_packet2): - rc = 0 + mosq_test.expect_packet(sock, "publish2", publish_packet2) + rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-subpub-qos2-1322.py b/test/broker/02-subpub-qos2-1322.py index bf79daeb..ccc293a8 100755 --- a/test/broker/02-subpub-qos2-1322.py +++ b/test/broker/02-subpub-qos2-1322.py @@ -87,46 +87,48 @@ def do_test(proto_ver): mosq_test.do_send_receive(pub, pubrel_packet, pubcomp_packet, "pubcomp1") pub.close() - if mosq_test.expect_packet(sub1, "publish1", publish1r_packet): - pub = mosq_test.do_client_connect(pub_connect_packet, pub_connack2_packet, timeout=10, port=port) - mosq_test.do_send_receive(pub, publish2s_packet, pubrec_packet, "pubrec2") - mosq_test.do_send_receive(pub, pubrel_packet, pubcomp_packet, "pubcomp2") - pub.close() + mosq_test.expect_packet(sub1, "publish1", publish1r_packet) + pub = mosq_test.do_client_connect(pub_connect_packet, pub_connack2_packet, timeout=10, port=port) + mosq_test.do_send_receive(pub, publish2s_packet, pubrec_packet, "pubrec2") + mosq_test.do_send_receive(pub, pubrel_packet, pubcomp_packet, "pubcomp2") + pub.close() - # We expect nothing on sub1 - mosq_test.do_ping(sub1, error_string="pingresp1") + # We expect nothing on sub1 + mosq_test.do_ping(sub1, error_string="pingresp1") - pub = mosq_test.do_client_connect(pub_connect_packet, pub_connack2_packet, timeout=10, port=port) - mosq_test.do_send_receive(pub, publish3s_packet, pubrec_packet, "pubrec3") - mosq_test.do_send_receive(pub, pubrel_packet, pubcomp_packet, "pubcomp3") - pub.close() + pub = mosq_test.do_client_connect(pub_connect_packet, pub_connack2_packet, timeout=10, port=port) + mosq_test.do_send_receive(pub, publish3s_packet, pubrec_packet, "pubrec3") + mosq_test.do_send_receive(pub, pubrel_packet, pubcomp_packet, "pubcomp3") + pub.close() - if mosq_test.expect_packet(sub1, "publish3", publish3r_packet): - sub2 = mosq_test.do_client_connect(sub2_connect_packet, sub2_connack_packet, timeout=10, port=port) - mosq_test.do_send_receive(sub2, subscribe2_packet, suback2_packet, "suback2") + mosq_test.expect_packet(sub1, "publish3", publish3r_packet) + sub2 = mosq_test.do_client_connect(sub2_connect_packet, sub2_connack_packet, timeout=10, port=port) + mosq_test.do_send_receive(sub2, subscribe2_packet, suback2_packet, "suback2") - pub = mosq_test.do_client_connect(pub_connect_packet, pub_connack2_packet, timeout=10, port=port) - mosq_test.do_send_receive(pub, publish4s_packet, pubrec_packet, "pubrec4") - mosq_test.do_send_receive(pub, pubrel_packet, pubcomp_packet, "pubcomp4") - pub.close() + pub = mosq_test.do_client_connect(pub_connect_packet, pub_connack2_packet, timeout=10, port=port) + mosq_test.do_send_receive(pub, publish4s_packet, pubrec_packet, "pubrec4") + mosq_test.do_send_receive(pub, pubrel_packet, pubcomp_packet, "pubcomp4") + pub.close() - # We expect nothing on sub2 - mosq_test.do_ping(sub2, error_string="pingresp2") + # We expect nothing on sub2 + mosq_test.do_ping(sub2, error_string="pingresp2") + + mosq_test.expect_packet(sub1, "publish4", publish4r_packet) + pub = mosq_test.do_client_connect(pub_connect_packet, pub_connack2_packet, timeout=10, port=port) + mosq_test.do_send_receive(pub, publish5s_packet, pubrec_packet, "pubrec5") + mosq_test.do_send_receive(pub, pubrel_packet, pubcomp_packet, "pubcomp5") + pub.close() + + # We expect nothing on sub2 + mosq_test.do_ping(sub2, error_string="pingresp2") - if mosq_test.expect_packet(sub1, "publish4", publish4r_packet): - pub = mosq_test.do_client_connect(pub_connect_packet, pub_connack2_packet, timeout=10, port=port) - mosq_test.do_send_receive(pub, publish5s_packet, pubrec_packet, "pubrec5") - mosq_test.do_send_receive(pub, pubrel_packet, pubcomp_packet, "pubcomp5") - pub.close() + mosq_test.expect_packet(sub1, "publish5", publish5r_packet) + rc = 0 - # We expect nothing on sub2 - mosq_test.do_ping(sub2, error_string="pingresp2") - - if mosq_test.expect_packet(sub1, "publish5", publish5r_packet): - rc = 0 - - sub2.close() + sub2.close() sub1.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-subpub-qos2-bad-puback-1.py b/test/broker/02-subpub-qos2-bad-puback-1.py index 22f3e44a..72f00003 100755 --- a/test/broker/02-subpub-qos2-bad-puback-1.py +++ b/test/broker/02-subpub-qos2-bad-puback-1.py @@ -47,18 +47,20 @@ def do_test(proto_ver): helper(port, proto_ver) - if mosq_test.expect_packet(sock, "publish 1r", publish1r_packet): - sock.send(puback1r_packet) - sock.send(pingreq_packet) - p = sock.recv(len(pingresp_packet)) - if len(p) == 0: - rc = 0 + mosq_test.expect_packet(sock, "publish 1r", publish1r_packet) + sock.send(puback1r_packet) + sock.send(pingreq_packet) + p = sock.recv(len(pingresp_packet)) + if len(p) == 0: + rc = 0 sock.close() except socket.error as e: if e.errno == errno.ECONNRESET: # Connection has been closed by peer, this is the expected behaviour rc = 0 + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-subpub-qos2-bad-puback-2.py b/test/broker/02-subpub-qos2-bad-puback-2.py index 93ad6dc5..76c4905c 100755 --- a/test/broker/02-subpub-qos2-bad-puback-2.py +++ b/test/broker/02-subpub-qos2-bad-puback-2.py @@ -45,19 +45,21 @@ def do_test(proto_ver): mosq_test.do_send_receive(helper, pubrel1s_packet, pubcomp1s_packet, "pubcomp 1s") helper.close() - if mosq_test.expect_packet(sock, "publish 1r", publish1r_packet): - mosq_test.do_send_receive(sock, pubrec1s_packet, pubrel1s_packet, "pubrel 1r") - sock.send(puback1r_packet) - sock.send(pingreq_packet) - p = sock.recv(len(pingresp_packet)) - if len(p) == 0: - rc = 0 + mosq_test.expect_packet(sock, "publish 1r", publish1r_packet) + mosq_test.do_send_receive(sock, pubrec1s_packet, pubrel1s_packet, "pubrel 1r") + sock.send(puback1r_packet) + sock.send(pingreq_packet) + p = sock.recv(len(pingresp_packet)) + if len(p) == 0: + rc = 0 sock.close() except socket.error as e: if e.errno == errno.ECONNRESET: # Connection has been closed by peer, this is the expected behaviour rc = 0 + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-subpub-qos2-bad-pubcomp.py b/test/broker/02-subpub-qos2-bad-pubcomp.py index 1587fc50..02df03de 100755 --- a/test/broker/02-subpub-qos2-bad-pubcomp.py +++ b/test/broker/02-subpub-qos2-bad-pubcomp.py @@ -47,18 +47,20 @@ def do_test(proto_ver): helper(port, proto_ver) - if mosq_test.expect_packet(sock, "publish 1r", publish1r_packet): - sock.send(pubcomp1r_packet) - sock.send(pingreq_packet) - p = sock.recv(len(pingresp_packet)) - if len(p) == 0: - rc = 0 + mosq_test.expect_packet(sock, "publish 1r", publish1r_packet) + sock.send(pubcomp1r_packet) + sock.send(pingreq_packet) + p = sock.recv(len(pingresp_packet)) + if len(p) == 0: + rc = 0 sock.close() except socket.error as e: if e.errno == errno.ECONNRESET: # Connection has been closed by peer, this is the expected behaviour rc = 0 + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-subpub-qos2-pubrec-error.py b/test/broker/02-subpub-qos2-pubrec-error.py index 967a2c9d..e90cd074 100755 --- a/test/broker/02-subpub-qos2-pubrec-error.py +++ b/test/broker/02-subpub-qos2-pubrec-error.py @@ -60,15 +60,17 @@ def do_test(): helper(port) # Should have now received a publish command - if mosq_test.expect_packet(sock, "publish 1", publish_1_packet): - sock.send(pubrec_1_packet) + mosq_test.expect_packet(sock, "publish 1", publish_1_packet) + sock.send(pubrec_1_packet) - if mosq_test.expect_packet(sock, "publish 2", publish_2_packet): - mosq_test.do_send_receive(sock, pubrec_2_packet, pubrel_2_packet, "pubrel 2") - sock.send(pubcomp_2_packet) - rc = 0 + mosq_test.expect_packet(sock, "publish 2", publish_2_packet) + mosq_test.do_send_receive(sock, pubrec_2_packet, pubrel_2_packet, "pubrel 2") + sock.send(pubcomp_2_packet) + rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-subpub-qos2-receive-maximum-1.py b/test/broker/02-subpub-qos2-receive-maximum-1.py index 679896d4..c2bc0c58 100755 --- a/test/broker/02-subpub-qos2-receive-maximum-1.py +++ b/test/broker/02-subpub-qos2-receive-maximum-1.py @@ -47,21 +47,23 @@ def do_test(): pub.wait() (stdo, stde) = pub.communicate() - if mosq_test.expect_packet(sock, "publish1", publish_packet1): - mosq_test.do_send_receive(sock, pubrec_packet1, pubrel_packet1, "pubrel1") - sock.send(pubcomp_packet1) + mosq_test.expect_packet(sock, "publish1", publish_packet1) + mosq_test.do_send_receive(sock, pubrec_packet1, pubrel_packet1, "pubrel1") + sock.send(pubcomp_packet1) - if mosq_test.expect_packet(sock, "publish2", publish_packet2): - mosq_test.do_send_receive(sock, pubrec_packet2, pubrel_packet2, "pubrel2") - sock.send(pubcomp_packet2) + mosq_test.expect_packet(sock, "publish2", publish_packet2) + mosq_test.do_send_receive(sock, pubrec_packet2, pubrel_packet2, "pubrel2") + sock.send(pubcomp_packet2) - if mosq_test.expect_packet(sock, "publish3", publish_packet3): - mosq_test.do_send_receive(sock, pubrec_packet3, pubrel_packet3, "pubrel3") - sock.send(pubcomp_packet3) + mosq_test.expect_packet(sock, "publish3", publish_packet3) + mosq_test.do_send_receive(sock, pubrec_packet3, pubrel_packet3, "pubrel3") + sock.send(pubcomp_packet3) - rc = 0 + rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-subpub-qos2-receive-maximum-2.py b/test/broker/02-subpub-qos2-receive-maximum-2.py index aaa8a27e..c5a05cc3 100755 --- a/test/broker/02-subpub-qos2-receive-maximum-2.py +++ b/test/broker/02-subpub-qos2-receive-maximum-2.py @@ -50,21 +50,23 @@ def do_test(proto_ver): pub.wait() (stdo, stde) = pub.communicate() - if mosq_test.expect_packet(sock, "publish1", publish_packet1): - if mosq_test.expect_packet(sock, "publish2", publish_packet2): - mosq_test.do_send_receive(sock, pubrec_packet1, pubrel_packet1, "pubrel1") - sock.send(pubcomp_packet1) + mosq_test.expect_packet(sock, "publish1", publish_packet1) + mosq_test.expect_packet(sock, "publish2", publish_packet2) + mosq_test.do_send_receive(sock, pubrec_packet1, pubrel_packet1, "pubrel1") + sock.send(pubcomp_packet1) - if mosq_test.expect_packet(sock, "publish3", publish_packet3): - mosq_test.do_send_receive(sock, pubrec_packet2, pubrel_packet2, "pubrel2") - sock.send(pubcomp_packet2) + mosq_test.expect_packet(sock, "publish3", publish_packet3) + mosq_test.do_send_receive(sock, pubrec_packet2, pubrel_packet2, "pubrel2") + sock.send(pubcomp_packet2) - mosq_test.do_send_receive(sock, pubrec_packet3, pubrel_packet3, "pubrel3") - sock.send(pubcomp_packet3) + mosq_test.do_send_receive(sock, pubrec_packet3, pubrel_packet3, "pubrel3") + sock.send(pubcomp_packet3) - rc = 0 + rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-subpub-qos2-receive-maximum-helper.py b/test/broker/02-subpub-qos2-receive-maximum-helper.py index 1fbe12c2..093ec598 100755 --- a/test/broker/02-subpub-qos2-receive-maximum-helper.py +++ b/test/broker/02-subpub-qos2-receive-maximum-helper.py @@ -49,6 +49,8 @@ def do_test(proto_ver): rc = 0 sock.close() + except mosq_test.TestError: + pass finally: if rc: print(stde.decode('utf-8')) diff --git a/test/broker/02-subpub-qos2.py b/test/broker/02-subpub-qos2.py index 69886d67..75cee903 100755 --- a/test/broker/02-subpub-qos2.py +++ b/test/broker/02-subpub-qos2.py @@ -37,13 +37,15 @@ def do_test(proto_ver): mosq_test.do_send_receive(sock, publish_packet, pubrec_packet, "pubrec") mosq_test.do_send_receive(sock, pubrel_packet, pubcomp_packet, "pubcomp") - if mosq_test.expect_packet(sock, "publish2", publish_packet2): - mosq_test.do_send_receive(sock, pubrec_packet2, pubrel_packet2, "pubrel2") - sock.send(pubcomp_packet2) - # Broker side of flow complete so can quit here. - rc = 0 + mosq_test.expect_packet(sock, "publish2", publish_packet2) + mosq_test.do_send_receive(sock, pubrec_packet2, pubrel_packet2, "pubrel2") + sock.send(pubcomp_packet2) + # Broker side of flow complete so can quit here. + rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-subscribe-dollar-v5.py b/test/broker/02-subscribe-dollar-v5.py index 1988be9f..f515881a 100755 --- a/test/broker/02-subscribe-dollar-v5.py +++ b/test/broker/02-subscribe-dollar-v5.py @@ -29,6 +29,8 @@ def do_test(proto_ver): rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-subscribe-invalid-utf8.py b/test/broker/02-subscribe-invalid-utf8.py index 6c2728b3..b77fab6b 100755 --- a/test/broker/02-subscribe-invalid-utf8.py +++ b/test/broker/02-subscribe-invalid-utf8.py @@ -34,6 +34,8 @@ def do_test(proto_ver): rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-subscribe-long-topic.py b/test/broker/02-subscribe-long-topic.py index 87b42bfe..85755699 100755 --- a/test/broker/02-subscribe-long-topic.py +++ b/test/broker/02-subscribe-long-topic.py @@ -30,6 +30,8 @@ def do_test(proto_ver): rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-subscribe-persistence-flipflop.py b/test/broker/02-subscribe-persistence-flipflop.py index 299a54fd..7a98eb27 100755 --- a/test/broker/02-subscribe-persistence-flipflop.py +++ b/test/broker/02-subscribe-persistence-flipflop.py @@ -69,10 +69,12 @@ def do_test(proto_ver): pub_sock = mosq_test.do_client_connect(connect_packet_pub, connack_packet_pub, port=port) mosq_test.do_send_receive(pub_sock, publish_packet, puback_packet, "publish") - if mosq_test.expect_packet(sub_sock, "publish receive", publish_packet): - rc = 0 + mosq_test.expect_packet(sub_sock, "publish receive", publish_packet) + rc = 0 sub_sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-subscribe-qos0.py b/test/broker/02-subscribe-qos0.py index 96fbb132..4bc3b95b 100755 --- a/test/broker/02-subscribe-qos0.py +++ b/test/broker/02-subscribe-qos0.py @@ -26,6 +26,8 @@ def do_test(proto_ver): rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-subscribe-qos1.py b/test/broker/02-subscribe-qos1.py index f6c24ab8..498cc3ce 100755 --- a/test/broker/02-subscribe-qos1.py +++ b/test/broker/02-subscribe-qos1.py @@ -24,6 +24,8 @@ def do_test(proto_ver): rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-subscribe-qos2.py b/test/broker/02-subscribe-qos2.py index 201d2e34..2c96beac 100755 --- a/test/broker/02-subscribe-qos2.py +++ b/test/broker/02-subscribe-qos2.py @@ -24,6 +24,8 @@ def do_test(proto_ver): rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-unsubscribe-invalid-no-topic.py b/test/broker/02-unsubscribe-invalid-no-topic.py index d914ec8b..bb5653a8 100755 --- a/test/broker/02-unsubscribe-invalid-no-topic.py +++ b/test/broker/02-unsubscribe-invalid-no-topic.py @@ -31,6 +31,8 @@ def do_test(proto_ver): rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-unsubscribe-qos0.py b/test/broker/02-unsubscribe-qos0.py index 4e7e4346..8307c1b8 100755 --- a/test/broker/02-unsubscribe-qos0.py +++ b/test/broker/02-unsubscribe-qos0.py @@ -28,6 +28,8 @@ def do_test(proto_ver): rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-unsubscribe-qos1.py b/test/broker/02-unsubscribe-qos1.py index c8853ff9..1757495f 100755 --- a/test/broker/02-unsubscribe-qos1.py +++ b/test/broker/02-unsubscribe-qos1.py @@ -27,6 +27,8 @@ def do_test(proto_ver): rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-unsubscribe-qos2-multiple.py b/test/broker/02-unsubscribe-qos2-multiple.py index 10d98dbb..76886725 100755 --- a/test/broker/02-unsubscribe-qos2-multiple.py +++ b/test/broker/02-unsubscribe-qos2-multiple.py @@ -33,6 +33,8 @@ def do_test(proto_ver): rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/02-unsubscribe-qos2.py b/test/broker/02-unsubscribe-qos2.py index 4ffc5e62..8029141b 100755 --- a/test/broker/02-unsubscribe-qos2.py +++ b/test/broker/02-unsubscribe-qos2.py @@ -27,6 +27,8 @@ def do_test(proto_ver): rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/03-pattern-matching.py b/test/broker/03-pattern-matching.py index 6ac43e1a..f12a4dd5 100755 --- a/test/broker/03-pattern-matching.py +++ b/test/broker/03-pattern-matching.py @@ -39,15 +39,15 @@ def pattern_test(sub_topic, pub_topic): helper(port, pub_topic) - if mosq_test.expect_packet(sock, "publish", publish_packet): - mosq_test.do_send_receive(sock, unsubscribe_packet, unsuback_packet, "unsuback") - - mosq_test.do_send_receive(sock, subscribe_packet, suback_packet, "suback") - - if mosq_test.expect_packet(sock, "publish retained", publish_retained_packet): - rc = 0 + mosq_test.expect_packet(sock, "publish", publish_packet) + mosq_test.do_send_receive(sock, unsubscribe_packet, unsuback_packet, "unsuback") + mosq_test.do_send_receive(sock, subscribe_packet, suback_packet, "suback") + mosq_test.expect_packet(sock, "publish retained", publish_retained_packet) + rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/03-publish-b2c-disconnect-qos1.py b/test/broker/03-publish-b2c-disconnect-qos1.py index b513c59d..ff684a0e 100755 --- a/test/broker/03-publish-b2c-disconnect-qos1.py +++ b/test/broker/03-publish-b2c-disconnect-qos1.py @@ -48,23 +48,25 @@ def do_test(proto_ver): helper(port) # Should have now received a publish command - if mosq_test.expect_packet(sock, "publish", publish_packet): - # Send our outgoing message. When we disconnect the broker - # should get rid of it and assume we're going to retry. - sock.send(publish2_packet) - sock.close() + mosq_test.expect_packet(sock, "publish", publish_packet) + # Send our outgoing message. When we disconnect the broker + # should get rid of it and assume we're going to retry. + sock.send(publish2_packet) + sock.close() - sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - sock.settimeout(60) # 60 seconds timeout is much longer than 5 seconds message retry. - sock.connect(("localhost", port)) + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + sock.settimeout(60) # 60 seconds timeout is much longer than 5 seconds message retry. + sock.connect(("localhost", port)) - mosq_test.do_send_receive(sock, connect_packet, connack2_packet, "connack") + mosq_test.do_send_receive(sock, connect_packet, connack2_packet, "connack") - if mosq_test.expect_packet(sock, "dup publish", publish_dup_packet): - sock.send(puback_packet) - rc = 0 + mosq_test.expect_packet(sock, "dup publish", publish_dup_packet) + sock.send(puback_packet) + rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/03-publish-b2c-disconnect-qos2.py b/test/broker/03-publish-b2c-disconnect-qos2.py index 3fbe9057..a71fa8b0 100755 --- a/test/broker/03-publish-b2c-disconnect-qos2.py +++ b/test/broker/03-publish-b2c-disconnect-qos2.py @@ -56,24 +56,26 @@ def do_test(proto_ver): helper(port) # Should have now received a publish command - if mosq_test.expect_packet(sock, "publish", publish_packet): - # Send our outgoing message. When we disconnect the broker - # should get rid of it and assume we're going to retry. - sock.send(publish2_packet) - sock.close() + mosq_test.expect_packet(sock, "publish", publish_packet) + # Send our outgoing message. When we disconnect the broker + # should get rid of it and assume we're going to retry. + sock.send(publish2_packet) + sock.close() - sock = mosq_test.do_client_connect(connect_packet, connack2_packet, port=port) - if mosq_test.expect_packet(sock, "dup publish", publish_dup_packet): - mosq_test.do_send_receive(sock, pubrec_packet, pubrel_packet, "pubrel") + sock = mosq_test.do_client_connect(connect_packet, connack2_packet, port=port) + mosq_test.expect_packet(sock, "dup publish", publish_dup_packet) + mosq_test.do_send_receive(sock, pubrec_packet, pubrel_packet, "pubrel") - sock.close() + sock.close() - sock = mosq_test.do_client_connect(connect_packet, connack2_packet, port=port) - if mosq_test.expect_packet(sock, "dup pubrel", pubrel_packet): - sock.send(pubcomp_packet) - rc = 0 - sock.close() + sock = mosq_test.do_client_connect(connect_packet, connack2_packet, port=port) + mosq_test.expect_packet(sock, "dup pubrel", pubrel_packet) + sock.send(pubcomp_packet) + rc = 0 + sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/03-publish-b2c-qos1-len.py b/test/broker/03-publish-b2c-qos1-len.py index 6214a34b..0bd791a6 100755 --- a/test/broker/03-publish-b2c-qos1-len.py +++ b/test/broker/03-publish-b2c-qos1-len.py @@ -40,13 +40,15 @@ def len_test(test, puback_packet): helper(port) # Should have now received a publish command - if mosq_test.expect_packet(sock, "publish", publish_packet): - sock.send(puback_packet) + mosq_test.expect_packet(sock, "publish", publish_packet) + sock.send(puback_packet) - mosq_test.do_ping(sock) - rc = 0 + mosq_test.do_ping(sock) + rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/03-publish-b2c-qos2-len.py b/test/broker/03-publish-b2c-qos2-len.py index 98f44441..cfe2a4af 100755 --- a/test/broker/03-publish-b2c-qos2-len.py +++ b/test/broker/03-publish-b2c-qos2-len.py @@ -47,14 +47,16 @@ def len_test(test, pubrec_packet, pubcomp_packet): helper(port) # Should have now received a publish command - if mosq_test.expect_packet(sock, "publish", publish_packet): - mosq_test.do_send_receive(sock, pubrec_packet, pubrel_packet, "pubrel") - sock.send(pubcomp_packet) + mosq_test.expect_packet(sock, "publish", publish_packet) + mosq_test.do_send_receive(sock, pubrec_packet, pubrel_packet, "pubrel") + sock.send(pubcomp_packet) - mosq_test.do_ping(sock) - rc = 0 + mosq_test.do_ping(sock) + rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/03-publish-b2c-timeout-qos1.py b/test/broker/03-publish-b2c-timeout-qos1.py index 6b1dcb73..a30d1af8 100755 --- a/test/broker/03-publish-b2c-timeout-qos1.py +++ b/test/broker/03-publish-b2c-timeout-qos1.py @@ -43,15 +43,17 @@ def do_test(proto_ver): helper(port) # Should have now received a publish command - if mosq_test.expect_packet(sock, "publish", publish_packet): - # Wait for longer than 5 seconds to get republish with dup set - # This is covered by the 8 second timeout + mosq_test.expect_packet(sock, "publish", publish_packet) + # Wait for longer than 5 seconds to get republish with dup set + # This is covered by the 8 second timeout - if mosq_test.expect_packet(sock, "dup publish", publish_dup_packet): - sock.send(puback_packet) - rc = 0 + mosq_test.expect_packet(sock, "dup publish", publish_dup_packet) + sock.send(puback_packet) + rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/03-publish-b2c-timeout-qos2.py b/test/broker/03-publish-b2c-timeout-qos2.py index 3ea3a2ed..6b80bf18 100755 --- a/test/broker/03-publish-b2c-timeout-qos2.py +++ b/test/broker/03-publish-b2c-timeout-qos2.py @@ -48,21 +48,23 @@ def do_test(proto_ver): helper(port) # Should have now received a publish command - if mosq_test.expect_packet(sock, "publish", publish_packet): - # Wait for longer than 5 seconds to get republish with dup set - # This is covered by the 8 second timeout + mosq_test.expect_packet(sock, "publish", publish_packet) + # Wait for longer than 5 seconds to get republish with dup set + # This is covered by the 8 second timeout - if mosq_test.expect_packet(sock, "dup publish", publish_dup_packet): - mosq_test.do_send_receive(sock, pubrec_packet, pubrel_packet, "pubrel") + mosq_test.expect_packet(sock, "dup publish", publish_dup_packet) + mosq_test.do_send_receive(sock, pubrec_packet, pubrel_packet, "pubrel") - # Wait for longer than 5 seconds to get republish with dup set - # This is covered by the 8 second timeout + # Wait for longer than 5 seconds to get republish with dup set + # This is covered by the 8 second timeout - if mosq_test.expect_packet(sock, "dup pubrel", pubrel_packet): - sock.send(pubcomp_packet) - rc = 0 + mosq_test.expect_packet(sock, "dup pubrel", pubrel_packet) + sock.send(pubcomp_packet) + rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/03-publish-c2b-disconnect-qos2.py b/test/broker/03-publish-c2b-disconnect-qos2.py index efe73b72..0432af2c 100755 --- a/test/broker/03-publish-c2b-disconnect-qos2.py +++ b/test/broker/03-publish-c2b-disconnect-qos2.py @@ -49,19 +49,21 @@ def do_test(proto_ver): sock = mosq_test.do_client_connect(connect_packet, connack2_packet, port=port, connack_error="connack 2") sock.send(publish_dup_packet) - if mosq_test.expect_packet(sock, "pubrec", pubrec_packet): - mosq_test.do_send_receive(sock, pubrel_packet, pubcomp_packet, "pubcomp") + mosq_test.expect_packet(sock, "pubrec", pubrec_packet) + mosq_test.do_send_receive(sock, pubrel_packet, pubcomp_packet, "pubcomp") - # Again, pretend we didn't receive this pubcomp - sock.close() + # Again, pretend we didn't receive this pubcomp + sock.close() - sock = mosq_test.do_client_connect(connect_packet, connack2_packet, port=port) - mosq_test.do_send_receive(sock, pubrel_dup_packet, pubcomp_packet, "pubcomp") + sock = mosq_test.do_client_connect(connect_packet, connack2_packet, port=port) + mosq_test.do_send_receive(sock, pubrel_dup_packet, pubcomp_packet, "pubcomp") - rc = 0 + rc = 0 sock.close() helper.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/03-publish-c2b-qos2-len.py b/test/broker/03-publish-c2b-qos2-len.py index 801cc540..30a4f151 100755 --- a/test/broker/03-publish-c2b-qos2-len.py +++ b/test/broker/03-publish-c2b-qos2-len.py @@ -30,6 +30,8 @@ def len_test(test, pubrel_packet): rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/03-publish-c2b-timeout-qos2.py b/test/broker/03-publish-c2b-timeout-qos2.py index 8fe0378a..54538fe2 100755 --- a/test/broker/03-publish-c2b-timeout-qos2.py +++ b/test/broker/03-publish-c2b-timeout-qos2.py @@ -28,12 +28,14 @@ def do_test(port): # Timeout is 8 seconds which means the broker should repeat the PUBREC. - if mosq_test.expect_packet(sock, "pubrec", pubrec_packet): - mosq_test.do_send_receive(sock, pubrel_packet, pubcomp_packet, "pubcomp") + mosq_test.expect_packet(sock, "pubrec", pubrec_packet) + mosq_test.do_send_receive(sock, pubrel_packet, pubcomp_packet, "pubcomp") - rc = 0 + rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/03-publish-dollar-v5.py b/test/broker/03-publish-dollar-v5.py index 79424447..49e6c149 100755 --- a/test/broker/03-publish-dollar-v5.py +++ b/test/broker/03-publish-dollar-v5.py @@ -35,6 +35,8 @@ try: rc = 0 sock.close() +except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/03-publish-dollar.py b/test/broker/03-publish-dollar.py index 2ef5ab90..f8b8d378 100755 --- a/test/broker/03-publish-dollar.py +++ b/test/broker/03-publish-dollar.py @@ -23,6 +23,8 @@ try: rc = 0 sock.close() +except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/03-publish-invalid-utf8.py b/test/broker/03-publish-invalid-utf8.py index e22b7012..958ea91c 100755 --- a/test/broker/03-publish-invalid-utf8.py +++ b/test/broker/03-publish-invalid-utf8.py @@ -34,6 +34,8 @@ def do_test(proto_ver): rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/03-publish-long-topic.py b/test/broker/03-publish-long-topic.py index 23d32628..1e47ba31 100755 --- a/test/broker/03-publish-long-topic.py +++ b/test/broker/03-publish-long-topic.py @@ -31,6 +31,8 @@ def do_test(proto_ver): rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/03-publish-qos1-max-inflight.py b/test/broker/03-publish-qos1-max-inflight.py index 0f7f3e1c..9dbf7590 100755 --- a/test/broker/03-publish-qos1-max-inflight.py +++ b/test/broker/03-publish-qos1-max-inflight.py @@ -32,6 +32,8 @@ def do_test(proto_ver): rc = 0 sock.close() + except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/03-publish-qos1-no-subscribers-v5.py b/test/broker/03-publish-qos1-no-subscribers-v5.py index 29a51bb2..6f32fcbc 100755 --- a/test/broker/03-publish-qos1-no-subscribers-v5.py +++ b/test/broker/03-publish-qos1-no-subscribers-v5.py @@ -61,6 +61,8 @@ try: rc = 0 sock.close() +except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/03-publish-qos1-queued-bytes.py b/test/broker/03-publish-qos1-queued-bytes.py index 3e26375b..7e935fb9 100755 --- a/test/broker/03-publish-qos1-queued-bytes.py +++ b/test/broker/03-publish-qos1-queued-bytes.py @@ -147,6 +147,8 @@ try: raise ValueError rc = 0 +except mosq_test.TestError: + pass finally: cq.put("quit") brokerMonitor.join() diff --git a/test/broker/03-publish-qos1-retain-disabled.py b/test/broker/03-publish-qos1-retain-disabled.py index 72335db9..44105e5e 100755 --- a/test/broker/03-publish-qos1-retain-disabled.py +++ b/test/broker/03-publish-qos1-retain-disabled.py @@ -38,6 +38,8 @@ def do_test(proto_ver): rc = 0 sock.close() + except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/03-publish-qos1.py b/test/broker/03-publish-qos1.py index db178af1..6c346eec 100755 --- a/test/broker/03-publish-qos1.py +++ b/test/broker/03-publish-qos1.py @@ -27,6 +27,9 @@ def do_test(proto_ver): rc = 0 sock.close() + + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/03-publish-qos2-max-inflight.py b/test/broker/03-publish-qos2-max-inflight.py index a685d1ed..053d1b08 100755 --- a/test/broker/03-publish-qos2-max-inflight.py +++ b/test/broker/03-publish-qos2-max-inflight.py @@ -37,6 +37,8 @@ def do_test(proto_ver): rc = 0 sock.close() + except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/03-publish-qos2.py b/test/broker/03-publish-qos2.py index 81bac308..5fc1817b 100755 --- a/test/broker/03-publish-qos2.py +++ b/test/broker/03-publish-qos2.py @@ -27,6 +27,8 @@ def do_test(proto_ver): rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/04-retain-check-source-persist-diff-port.py b/test/broker/04-retain-check-source-persist-diff-port.py index e159a105..c7a41591 100755 --- a/test/broker/04-retain-check-source-persist-diff-port.py +++ b/test/broker/04-retain-check-source-persist-diff-port.py @@ -73,25 +73,27 @@ def do_test(proto_ver, per_listener, username): sock = mosq_test.do_client_connect(connect2_packet, connack2_packet, port=port2) mosq_test.do_send_receive(sock, subscribe_packet, suback_packet, "suback 1") - if mosq_test.expect_packet(sock, "publish", publish_packet): - sock.close() + mosq_test.expect_packet(sock, "publish", publish_packet) + sock.close() - # Remove "write" ability - write_acl_2(acl_file, username) - broker.terminate() - broker.wait() - if os.path.isfile(persistence_file) == False: - raise FileNotFoundError("Persistence file not written") + # Remove "write" ability + write_acl_2(acl_file, username) + broker.terminate() + broker.wait() + if os.path.isfile(persistence_file) == False: + raise FileNotFoundError("Persistence file not written") - broker = mosq_test.start_broker(filename=os.path.basename(__file__), use_conf=True, port=port1) + broker = mosq_test.start_broker(filename=os.path.basename(__file__), use_conf=True, port=port1) - sock = mosq_test.do_client_connect(connect2_packet, connack2_packet, port=port2) - mosq_test.do_send_receive(sock, subscribe_packet, suback_packet, "suback 2") - # If we receive the retained message here, it is a failure. - mosq_test.do_ping(sock) - rc = 0 + sock = mosq_test.do_client_connect(connect2_packet, connack2_packet, port=port2) + mosq_test.do_send_receive(sock, subscribe_packet, suback_packet, "suback 2") + # If we receive the retained message here, it is a failure. + mosq_test.do_ping(sock) + rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/04-retain-check-source-persist.py b/test/broker/04-retain-check-source-persist.py index c5bee3f3..83ea97ee 100755 --- a/test/broker/04-retain-check-source-persist.py +++ b/test/broker/04-retain-check-source-persist.py @@ -61,23 +61,25 @@ def do_test(proto_ver, per_listener, username): sock = mosq_test.do_client_connect(connect_packet, connack_packet, port=port) mosq_test.do_send_receive(sock, subscribe_packet, suback_packet, "suback 1") - if mosq_test.expect_packet(sock, "publish", publish_packet): - sock.close() + mosq_test.expect_packet(sock, "publish", publish_packet) + sock.close() - # Remove "write" ability - write_acl_2(acl_file, username) - broker.terminate() - broker.wait() + # Remove "write" ability + write_acl_2(acl_file, username) + broker.terminate() + broker.wait() - broker = mosq_test.start_broker(filename=os.path.basename(__file__), use_conf=True, port=port) + broker = mosq_test.start_broker(filename=os.path.basename(__file__), use_conf=True, port=port) - sock = mosq_test.do_client_connect(connect_packet, connack_packet, port=port) - mosq_test.do_send_receive(sock, subscribe_packet, suback_packet, "suback 2") - # If we receive the retained message here, it is a failure. - mosq_test.do_ping(sock) - rc = 0 + sock = mosq_test.do_client_connect(connect_packet, connack_packet, port=port) + mosq_test.do_send_receive(sock, subscribe_packet, suback_packet, "suback 2") + # If we receive the retained message here, it is a failure. + mosq_test.do_ping(sock) + rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/04-retain-check-source.py b/test/broker/04-retain-check-source.py index 20a21ea4..1a2b5560 100755 --- a/test/broker/04-retain-check-source.py +++ b/test/broker/04-retain-check-source.py @@ -49,20 +49,22 @@ def do_test(proto_ver, per_listener): sock = mosq_test.do_client_connect(connect_packet, connack_packet, port=port) mosq_test.do_send_receive(sock, subscribe_packet, suback_packet, "suback 1") - if mosq_test.expect_packet(sock, "publish", publish_packet): - sock.close() + mosq_test.expect_packet(sock, "publish", publish_packet) + sock.close() - # Remove "write" ability - write_acl_2(acl_file) - broker.send_signal(signal.SIGHUP) + # Remove "write" ability + write_acl_2(acl_file) + broker.send_signal(signal.SIGHUP) - sock = mosq_test.do_client_connect(connect_packet, connack_packet, port=port) - mosq_test.do_send_receive(sock, subscribe_packet, suback_packet, "suback 2") - # If we receive the retained message here, it is a failure. - mosq_test.do_ping(sock) - rc = 0 + sock = mosq_test.do_client_connect(connect_packet, connack_packet, port=port) + mosq_test.do_send_receive(sock, subscribe_packet, suback_packet, "suback 2") + # If we receive the retained message here, it is a failure. + mosq_test.do_ping(sock) + rc = 0 sock.close() + except mosq_test.TestError: + pass finally: os.remove(conf_file) os.remove(acl_file) diff --git a/test/broker/04-retain-qos0-clear.py b/test/broker/04-retain-qos0-clear.py index 8698cc24..03c111b7 100755 --- a/test/broker/04-retain-qos0-clear.py +++ b/test/broker/04-retain-qos0-clear.py @@ -32,25 +32,27 @@ def do_test(proto_ver): # Subscribe to topic, we should get the retained message back. mosq_test.do_send_receive(sock, subscribe_packet, suback_packet, "suback") - if mosq_test.expect_packet(sock, "publish", publish_packet): - # Now unsubscribe from the topic before we clear the retained - # message. - mosq_test.do_send_receive(sock, unsubscribe_packet, unsuback_packet, "unsuback") + mosq_test.expect_packet(sock, "publish", publish_packet) + # Now unsubscribe from the topic before we clear the retained + # message. + mosq_test.do_send_receive(sock, unsubscribe_packet, unsuback_packet, "unsuback") - # Now clear the retained message. - sock.send(retain_clear_packet) + # Now clear the retained message. + sock.send(retain_clear_packet) - # Subscribe to topic, we shouldn't get anything back apart - # from the SUBACK. - mosq_test.do_send_receive(sock, subscribe_packet, suback_packet, "suback") - time.sleep(1) - # If we do get something back, it should be before this ping, so if - # this succeeds then we're ok. - mosq_test.do_ping(sock) - # This is the expected event - rc = 0 + # Subscribe to topic, we shouldn't get anything back apart + # from the SUBACK. + mosq_test.do_send_receive(sock, subscribe_packet, suback_packet, "suback") + time.sleep(1) + # If we do get something back, it should be before this ping, so if + # this succeeds then we're ok. + mosq_test.do_ping(sock) + # This is the expected event + rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/04-retain-qos0-fresh.py b/test/broker/04-retain-qos0-fresh.py index 654116d5..c2495f9f 100755 --- a/test/broker/04-retain-qos0-fresh.py +++ b/test/broker/04-retain-qos0-fresh.py @@ -28,6 +28,8 @@ def do_test(proto_ver): rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/04-retain-qos0-repeated.py b/test/broker/04-retain-qos0-repeated.py index 2b99354a..44a6b6da 100755 --- a/test/broker/04-retain-qos0-repeated.py +++ b/test/broker/04-retain-qos0-repeated.py @@ -29,14 +29,16 @@ def do_test(proto_ver): sock.send(publish_packet) mosq_test.do_send_receive(sock, subscribe_packet, suback_packet, "suback") - if mosq_test.expect_packet(sock, "publish", publish_packet): - mosq_test.do_send_receive(sock, unsubscribe_packet, unsuback_packet, "unsuback") - mosq_test.do_send_receive(sock, subscribe_packet, suback_packet, "suback") + mosq_test.expect_packet(sock, "publish", publish_packet) + mosq_test.do_send_receive(sock, unsubscribe_packet, unsuback_packet, "unsuback") + mosq_test.do_send_receive(sock, subscribe_packet, suback_packet, "suback") - if mosq_test.expect_packet(sock, "publish", publish_packet): - rc = 0 + mosq_test.expect_packet(sock, "publish", publish_packet) + rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/04-retain-qos0.py b/test/broker/04-retain-qos0.py index 0e4d281e..ffe08acf 100755 --- a/test/broker/04-retain-qos0.py +++ b/test/broker/04-retain-qos0.py @@ -24,10 +24,12 @@ def do_test(proto_ver): sock.send(publish_packet) mosq_test.do_send_receive(sock, subscribe_packet, suback_packet, "suback") - if mosq_test.expect_packet(sock, "publish", publish_packet): - rc = 0 + mosq_test.expect_packet(sock, "publish", publish_packet) + rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/04-retain-qos1-qos0.py b/test/broker/04-retain-qos1-qos0.py index 58fc93f0..aceadf97 100755 --- a/test/broker/04-retain-qos1-qos0.py +++ b/test/broker/04-retain-qos1-qos0.py @@ -32,10 +32,12 @@ def do_test(proto_ver): mosq_test.do_send_receive(sock, publish_packet, puback_packet, "puback") mosq_test.do_send_receive(sock, subscribe_packet, suback_packet, "suback") - if mosq_test.expect_packet(sock, "publish0", publish0_packet): - rc = 0 + mosq_test.expect_packet(sock, "publish0", publish0_packet) + rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/04-retain-upgrade-outgoing-qos.py b/test/broker/04-retain-upgrade-outgoing-qos.py index 5b7f0196..2124c4c8 100755 --- a/test/broker/04-retain-upgrade-outgoing-qos.py +++ b/test/broker/04-retain-upgrade-outgoing-qos.py @@ -36,10 +36,12 @@ def do_test(proto_ver): mosq_test.do_send_receive(sock, subscribe_packet, suback_packet, "suback") - if mosq_test.expect_packet(sock, "publish", publish_packet2): - rc = 0 + mosq_test.expect_packet(sock, "publish", publish_packet2) + rc = 0 sock.close() + except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/05-clean-session-qos1.py b/test/broker/05-clean-session-qos1.py index a7821f01..a9b710c4 100755 --- a/test/broker/05-clean-session-qos1.py +++ b/test/broker/05-clean-session-qos1.py @@ -49,11 +49,13 @@ def do_test(proto_ver): # Now reconnect and expect a publish message. sock = mosq_test.do_client_connect(connect_packet, connack2_packet, timeout=30, port=port) - if mosq_test.expect_packet(sock, "publish", publish_packet): - sock.send(puback_packet) - rc = 0 + mosq_test.expect_packet(sock, "publish", publish_packet) + sock.send(puback_packet) + rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/05-session-expiry-v5.py b/test/broker/05-session-expiry-v5.py index d2aa95dc..4d6f3a28 100755 --- a/test/broker/05-session-expiry-v5.py +++ b/test/broker/05-session-expiry-v5.py @@ -90,6 +90,8 @@ try: rc = 0 sock.close() +except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/06-bridge-b2br-disconnect-qos1.py b/test/broker/06-bridge-b2br-disconnect-qos1.py index 1a8e275e..a7aa5ff2 100755 --- a/test/broker/06-bridge-b2br-disconnect-qos1.py +++ b/test/broker/06-bridge-b2br-disconnect-qos1.py @@ -68,32 +68,34 @@ def do_test(proto_ver): (bridge, address) = ssock.accept() bridge.settimeout(20) - if mosq_test.expect_packet(bridge, "connect", connect_packet): - bridge.send(connack_packet) + mosq_test.expect_packet(bridge, "connect", connect_packet) + bridge.send(connack_packet) - if mosq_test.expect_packet(bridge, "subscribe", subscribe_packet): - bridge.send(suback_packet) + mosq_test.expect_packet(bridge, "subscribe", subscribe_packet) + bridge.send(suback_packet) - bridge.send(publish_packet) - # Bridge doesn't have time to respond but should expect us to retry - # and so remove PUBACK. - bridge.close() + bridge.send(publish_packet) + # Bridge doesn't have time to respond but should expect us to retry + # and so remove PUBACK. + bridge.close() - (bridge, address) = ssock.accept() - bridge.settimeout(20) + (bridge, address) = ssock.accept() + bridge.settimeout(20) - if mosq_test.expect_packet(bridge, "connect", connect_packet): - bridge.send(connack_packet) + mosq_test.expect_packet(bridge, "connect", connect_packet) + bridge.send(connack_packet) - if mosq_test.expect_packet(bridge, "2nd subscribe", subscribe2_packet): - bridge.send(suback2_packet) + mosq_test.expect_packet(bridge, "2nd subscribe", subscribe2_packet) + bridge.send(suback2_packet) - # Send a different publish message to make sure the response isn't to the old one. - bridge.send(publish2_packet) - if mosq_test.expect_packet(bridge, "puback", puback2_packet): - rc = 0 + # Send a different publish message to make sure the response isn't to the old one. + bridge.send(publish2_packet) + mosq_test.expect_packet(bridge, "puback", puback2_packet) + rc = 0 bridge.close() + except mosq_test.TestError: + pass finally: os.remove(conf_file) try: diff --git a/test/broker/06-bridge-b2br-disconnect-qos2.py b/test/broker/06-bridge-b2br-disconnect-qos2.py index 82755d1e..d3757e42 100755 --- a/test/broker/06-bridge-b2br-disconnect-qos2.py +++ b/test/broker/06-bridge-b2br-disconnect-qos2.py @@ -68,47 +68,49 @@ def do_test(proto_ver): (bridge, address) = ssock.accept() bridge.settimeout(20) - if mosq_test.expect_packet(bridge, "connect", connect_packet): - bridge.send(connack_packet) + mosq_test.expect_packet(bridge, "connect", connect_packet) + bridge.send(connack_packet) - if mosq_test.expect_packet(bridge, "subscribe", subscribe_packet): - bridge.send(suback_packet) + mosq_test.expect_packet(bridge, "subscribe", subscribe_packet) + bridge.send(suback_packet) - bridge.send(publish_packet) - bridge.close() + bridge.send(publish_packet) + bridge.close() - (bridge, address) = ssock.accept() - bridge.settimeout(20) + (bridge, address) = ssock.accept() + bridge.settimeout(20) - if mosq_test.expect_packet(bridge, "connect", connect_packet): - bridge.send(connack_packet) + mosq_test.expect_packet(bridge, "connect", connect_packet) + bridge.send(connack_packet) - if mosq_test.expect_packet(bridge, "2nd subscribe", subscribe2_packet): - bridge.send(suback2_packet) - bridge.send(publish_dup_packet) + mosq_test.expect_packet(bridge, "2nd subscribe", subscribe2_packet) + bridge.send(suback2_packet) + bridge.send(publish_dup_packet) - if mosq_test.expect_packet(bridge, "pubrec", pubrec_packet): - bridge.send(pubrel_packet) - bridge.close() + mosq_test.expect_packet(bridge, "pubrec", pubrec_packet) + bridge.send(pubrel_packet) + bridge.close() - (bridge, address) = ssock.accept() - bridge.settimeout(20) + (bridge, address) = ssock.accept() + bridge.settimeout(20) - if mosq_test.expect_packet(bridge, "connect", connect_packet): - bridge.send(connack_packet) + mosq_test.expect_packet(bridge, "connect", connect_packet) + bridge.send(connack_packet) - if mosq_test.expect_packet(bridge, "3rd subscribe", subscribe3_packet): - bridge.send(suback3_packet) + mosq_test.expect_packet(bridge, "3rd subscribe", subscribe3_packet) + bridge.send(suback3_packet) - bridge.send(publish_dup_packet) + bridge.send(publish_dup_packet) - if mosq_test.expect_packet(bridge, "2nd pubrec", pubrec_packet): - bridge.send(pubrel_packet) + mosq_test.expect_packet(bridge, "2nd pubrec", pubrec_packet) + bridge.send(pubrel_packet) - if mosq_test.expect_packet(bridge, "pubcomp", pubcomp_packet): - rc = 0 + mosq_test.expect_packet(bridge, "pubcomp", pubcomp_packet) + rc = 0 bridge.close() + except mosq_test.TestError: + pass finally: os.remove(conf_file) try: diff --git a/test/broker/06-bridge-b2br-late-connection-retain.py b/test/broker/06-bridge-b2br-late-connection-retain.py index 8365c1b5..71b84a71 100755 --- a/test/broker/06-bridge-b2br-late-connection-retain.py +++ b/test/broker/06-bridge-b2br-late-connection-retain.py @@ -77,18 +77,20 @@ def do_test(proto_ver): (bridge, address) = ssock.accept() bridge.settimeout(20) - if mosq_test.expect_packet(bridge, "connect", connect_packet): - bridge.send(connack_packet) + mosq_test.expect_packet(bridge, "connect", connect_packet) + bridge.send(connack_packet) - if mosq_test.expect_packet(bridge, "publish", publish_packet): - bridge.send(puback_packet) - # Guard against multiple retained messages of the same type by - # sending a pingreq to give us something to expect back. If we get - # a publish, it's a fail. - mosq_test.do_ping(bridge) - rc = 0 + mosq_test.expect_packet(bridge, "publish", publish_packet) + bridge.send(puback_packet) + # Guard against multiple retained messages of the same type by + # sending a pingreq to give us something to expect back. If we get + # a publish, it's a fail. + mosq_test.do_ping(bridge) + rc = 0 bridge.close() + except mosq_test.TestError: + pass finally: os.remove(conf_file) try: diff --git a/test/broker/06-bridge-b2br-late-connection.py b/test/broker/06-bridge-b2br-late-connection.py index 58acb142..63be7080 100755 --- a/test/broker/06-bridge-b2br-late-connection.py +++ b/test/broker/06-bridge-b2br-late-connection.py @@ -57,13 +57,15 @@ def do_test(proto_ver): client.close() # We've now sent a message to the broker that should be delivered to us via the bridge - if mosq_test.expect_packet(bridge, "connect", connect_packet): - bridge.send(connack_packet) + mosq_test.expect_packet(bridge, "connect", connect_packet) + bridge.send(connack_packet) - if mosq_test.expect_packet(bridge, "publish", publish_packet): - rc = 0 + mosq_test.expect_packet(bridge, "publish", publish_packet) + rc = 0 bridge.close() + except mosq_test.TestError: + pass finally: os.remove(conf_file) try: diff --git a/test/broker/06-bridge-b2br-remapping.py b/test/broker/06-bridge-b2br-remapping.py index eb18ce6c..dd9854f2 100755 --- a/test/broker/06-bridge-b2br-remapping.py +++ b/test/broker/06-bridge-b2br-remapping.py @@ -133,6 +133,8 @@ def do_test(proto_ver): sock.close() bridge.close() + except mosq_test.TestError: + pass finally: os.remove(conf_file) try: diff --git a/test/broker/06-bridge-br2b-disconnect-qos1.py b/test/broker/06-bridge-br2b-disconnect-qos1.py index 62322230..269096d5 100755 --- a/test/broker/06-bridge-br2b-disconnect-qos1.py +++ b/test/broker/06-bridge-br2b-disconnect-qos1.py @@ -64,39 +64,41 @@ def do_test(proto_ver): (bridge, address) = ssock.accept() bridge.settimeout(20) - if mosq_test.expect_packet(bridge, "connect", connect_packet): - bridge.send(connack_packet) + mosq_test.expect_packet(bridge, "connect", connect_packet) + bridge.send(connack_packet) - if mosq_test.expect_packet(bridge, "subscribe", subscribe_packet): - bridge.send(suback_packet) + mosq_test.expect_packet(bridge, "subscribe", subscribe_packet) + bridge.send(suback_packet) - # Helper - helper_connect_packet = mosq_test.gen_connect("test-helper", keepalive=keepalive, proto_ver=proto_ver) - helper_connack_packet = mosq_test.gen_connack(rc=0, proto_ver=proto_ver) - mid = 128 - helper_publish_packet = mosq_test.gen_publish("bridge/disconnect/test", qos=1, mid=mid, payload="disconnect-message", proto_ver=proto_ver) - helper_puback_packet = mosq_test.gen_puback(mid, proto_ver=proto_ver) - helper_sock = mosq_test.do_client_connect(helper_connect_packet, helper_connack_packet, port=port2, connack_error="helper connack") - mosq_test.do_send_receive(helper_sock, publish_packet, puback_packet, "helper puback") - helper_sock.close() - # End helper + # Helper + helper_connect_packet = mosq_test.gen_connect("test-helper", keepalive=keepalive, proto_ver=proto_ver) + helper_connack_packet = mosq_test.gen_connack(rc=0, proto_ver=proto_ver) + mid = 128 + helper_publish_packet = mosq_test.gen_publish("bridge/disconnect/test", qos=1, mid=mid, payload="disconnect-message", proto_ver=proto_ver) + helper_puback_packet = mosq_test.gen_puback(mid, proto_ver=proto_ver) + helper_sock = mosq_test.do_client_connect(helper_connect_packet, helper_connack_packet, port=port2, connack_error="helper connack") + mosq_test.do_send_receive(helper_sock, publish_packet, puback_packet, "helper puback") + helper_sock.close() + # End helper - if mosq_test.expect_packet(bridge, "publish", publish_packet): - bridge.close() + mosq_test.expect_packet(bridge, "publish", publish_packet) + bridge.close() - (bridge, address) = ssock.accept() - bridge.settimeout(20) + (bridge, address) = ssock.accept() + bridge.settimeout(20) - if mosq_test.expect_packet(bridge, "2nd connect", connect_packet): - bridge.send(connack_packet) + mosq_test.expect_packet(bridge, "2nd connect", connect_packet) + bridge.send(connack_packet) - if mosq_test.expect_packet(bridge, "2nd subscribe", subscribe2_packet): - bridge.send(suback2_packet) + mosq_test.expect_packet(bridge, "2nd subscribe", subscribe2_packet) + bridge.send(suback2_packet) - if mosq_test.expect_packet(bridge, "2nd publish", publish_dup_packet): - rc = 0 + mosq_test.expect_packet(bridge, "2nd publish", publish_dup_packet) + rc = 0 bridge.close() + except mosq_test.TestError: + pass finally: os.remove(conf_file) try: diff --git a/test/broker/06-bridge-br2b-disconnect-qos2.py b/test/broker/06-bridge-br2b-disconnect-qos2.py index 68c87470..3579bcf8 100755 --- a/test/broker/06-bridge-br2b-disconnect-qos2.py +++ b/test/broker/06-bridge-br2b-disconnect-qos2.py @@ -70,61 +70,63 @@ def do_test(proto_ver): (bridge, address) = ssock.accept() bridge.settimeout(20) - if mosq_test.expect_packet(bridge, "connect", connect_packet): - bridge.send(connack_packet) + mosq_test.expect_packet(bridge, "connect", connect_packet) + bridge.send(connack_packet) - if mosq_test.expect_packet(bridge, "subscribe", subscribe_packet): - bridge.send(suback_packet) + mosq_test.expect_packet(bridge, "subscribe", subscribe_packet) + bridge.send(suback_packet) - # Helper - helper_connect_packet = mosq_test.gen_connect("test-helper", keepalive=keepalive, proto_ver=proto_ver) - helper_connack_packet = mosq_test.gen_connack(rc=0, proto_ver=proto_ver) + # Helper + helper_connect_packet = mosq_test.gen_connect("test-helper", keepalive=keepalive, proto_ver=proto_ver) + helper_connack_packet = mosq_test.gen_connack(rc=0, proto_ver=proto_ver) - mid = 312 - helper_publish_packet = mosq_test.gen_publish("bridge/disconnect/test", qos=2, mid=mid, payload="disconnect-message", proto_ver=proto_ver) - helper_pubrec_packet = mosq_test.gen_pubrec(mid=mid, proto_ver=proto_ver) - helper_pubrel_packet = mosq_test.gen_pubrel(mid=mid, proto_ver=proto_ver) - helper_pubcomp_packet = mosq_test.gen_pubcomp(mid=mid, proto_ver=proto_ver) + mid = 312 + helper_publish_packet = mosq_test.gen_publish("bridge/disconnect/test", qos=2, mid=mid, payload="disconnect-message", proto_ver=proto_ver) + helper_pubrec_packet = mosq_test.gen_pubrec(mid=mid, proto_ver=proto_ver) + helper_pubrel_packet = mosq_test.gen_pubrel(mid=mid, proto_ver=proto_ver) + helper_pubcomp_packet = mosq_test.gen_pubcomp(mid=mid, proto_ver=proto_ver) - helper_sock = mosq_test.do_client_connect(helper_connect_packet, helper_connack_packet, port=port2, connack_error="helper connack") - mosq_test.do_send_receive(helper_sock, helper_publish_packet, helper_pubrec_packet, "helper pubrec") - mosq_test.do_send_receive(helper_sock, helper_pubrel_packet, helper_pubcomp_packet, "helper pubcomp") - helper_sock.close() - # End helper + helper_sock = mosq_test.do_client_connect(helper_connect_packet, helper_connack_packet, port=port2, connack_error="helper connack") + mosq_test.do_send_receive(helper_sock, helper_publish_packet, helper_pubrec_packet, "helper pubrec") + mosq_test.do_send_receive(helper_sock, helper_pubrel_packet, helper_pubcomp_packet, "helper pubcomp") + helper_sock.close() + # End helper - if mosq_test.expect_packet(bridge, "publish", publish_packet): - bridge.close() + mosq_test.expect_packet(bridge, "publish", publish_packet) + bridge.close() - (bridge, address) = ssock.accept() - bridge.settimeout(20) + (bridge, address) = ssock.accept() + bridge.settimeout(20) - if mosq_test.expect_packet(bridge, "connect", connect_packet): - bridge.send(connack_packet) + mosq_test.expect_packet(bridge, "connect", connect_packet) + bridge.send(connack_packet) - if mosq_test.expect_packet(bridge, "2nd subscribe", subscribe2_packet): - bridge.send(suback2_packet) + mosq_test.expect_packet(bridge, "2nd subscribe", subscribe2_packet) + bridge.send(suback2_packet) - if mosq_test.expect_packet(bridge, "2nd publish", publish_dup_packet): - bridge.send(pubrec_packet) + mosq_test.expect_packet(bridge, "2nd publish", publish_dup_packet) + bridge.send(pubrec_packet) - if mosq_test.expect_packet(bridge, "pubrel", pubrel_packet): - bridge.close() + mosq_test.expect_packet(bridge, "pubrel", pubrel_packet) + bridge.close() - (bridge, address) = ssock.accept() - bridge.settimeout(20) + (bridge, address) = ssock.accept() + bridge.settimeout(20) - if mosq_test.expect_packet(bridge, "connect", connect_packet): - bridge.send(connack_packet) + mosq_test.expect_packet(bridge, "connect", connect_packet) + bridge.send(connack_packet) - if mosq_test.expect_packet(bridge, "3rd subscribe", subscribe3_packet): - bridge.send(suback3_packet) + mosq_test.expect_packet(bridge, "3rd subscribe", subscribe3_packet) + bridge.send(suback3_packet) - if mosq_test.expect_packet(bridge, "2nd pubrel", pubrel_packet): - bridge.send(pubcomp_packet) - rc = 0 + mosq_test.expect_packet(bridge, "2nd pubrel", pubrel_packet) + bridge.send(pubcomp_packet) + rc = 0 bridge.close() + except mosq_test.TestError: + pass finally: os.remove(conf_file) try: diff --git a/test/broker/06-bridge-br2b-remapping.py b/test/broker/06-bridge-br2b-remapping.py index a19fc260..3f0fc4f0 100755 --- a/test/broker/06-bridge-br2b-remapping.py +++ b/test/broker/06-bridge-br2b-remapping.py @@ -113,6 +113,8 @@ def do_test(proto_ver): sock.close() bridge.close() + except mosq_test.TestError: + pass finally: os.remove(conf_file) try: diff --git a/test/broker/06-bridge-clean-session.py b/test/broker/06-bridge-clean-session.py index 8b745a7d..c3408929 100755 --- a/test/broker/06-bridge-clean-session.py +++ b/test/broker/06-bridge-clean-session.py @@ -217,6 +217,8 @@ def do_test(proto_ver, cs, lcs=None): success = True + except mosq_test.TestError: + pass finally: os.remove(conf_file_a) os.remove(conf_file_b) diff --git a/test/broker/06-bridge-fail-persist-resend-qos1.py b/test/broker/06-bridge-fail-persist-resend-qos1.py index fdce7889..f3079741 100755 --- a/test/broker/06-bridge-fail-persist-resend-qos1.py +++ b/test/broker/06-bridge-fail-persist-resend-qos1.py @@ -69,21 +69,23 @@ def do_test(proto_ver): (conn, address) = sock.accept() conn.settimeout(20) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) + mosq_test.expect_packet(conn, "connect", connect_packet) + conn.send(connack_packet) - if mosq_test.expect_packet(conn, "unsubscribe", unsubscribe_packet): - conn.send(unsuback_packet) + mosq_test.expect_packet(conn, "unsubscribe", unsubscribe_packet) + conn.send(unsuback_packet) - # Send the unexpected puback packet - conn.send(puback_packet_unknown) + # Send the unexpected puback packet + conn.send(puback_packet_unknown) - # Send a legitimate publish packet to verify everything is still ok - conn.send(publish_packet) + # Send a legitimate publish packet to verify everything is still ok + conn.send(publish_packet) - if mosq_test.expect_packet(conn, "puback", puback_packet): - rc = 0 + mosq_test.expect_packet(conn, "puback", puback_packet) + rc = 0 + except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/06-bridge-fail-persist-resend-qos2.py b/test/broker/06-bridge-fail-persist-resend-qos2.py index 9deefacf..d175a956 100755 --- a/test/broker/06-bridge-fail-persist-resend-qos2.py +++ b/test/broker/06-bridge-fail-persist-resend-qos2.py @@ -75,27 +75,29 @@ def do_test(proto_ver): (conn, address) = sock.accept() conn.settimeout(20) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) + mosq_test.expect_packet(conn, "connect", connect_packet) + conn.send(connack_packet) - if mosq_test.expect_packet(conn, "unsubscribe", unsubscribe_packet): - conn.send(unsuback_packet) + mosq_test.expect_packet(conn, "unsubscribe", unsubscribe_packet) + conn.send(unsuback_packet) - # Send the unexpected pubrec packet - conn.send(pubrec_packet_unknown1) - if mosq_test.expect_packet(conn, "pubrel", pubrel_packet_unknown1): + # Send the unexpected pubrec packet + conn.send(pubrec_packet_unknown1) + mosq_test.expect_packet(conn, "pubrel", pubrel_packet_unknown1) - conn.send(pubrel_packet_unknown2) - if mosq_test.expect_packet(conn, "pubcomp", pubcomp_packet_unknown2): + conn.send(pubrel_packet_unknown2) + mosq_test.expect_packet(conn, "pubcomp", pubcomp_packet_unknown2) - conn.send(pubcomp_packet_unknown3) + conn.send(pubcomp_packet_unknown3) - # Send a legitimate publish packet to verify everything is still ok - conn.send(publish_packet) + # Send a legitimate publish packet to verify everything is still ok + conn.send(publish_packet) - if mosq_test.expect_packet(conn, "puback", puback_packet): - rc = 0 + mosq_test.expect_packet(conn, "puback", puback_packet) + rc = 0 + except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/06-bridge-no-local.py b/test/broker/06-bridge-no-local.py index 88851a3c..7ff8dee8 100755 --- a/test/broker/06-bridge-no-local.py +++ b/test/broker/06-bridge-no-local.py @@ -30,6 +30,8 @@ def do_test(proto_ver_connect, proto_ver_msgs, sub_opts): rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/06-bridge-outgoing-retain.py b/test/broker/06-bridge-outgoing-retain.py index acf52809..2c59df65 100755 --- a/test/broker/06-bridge-outgoing-retain.py +++ b/test/broker/06-bridge-outgoing-retain.py @@ -67,23 +67,25 @@ def do_test(proto_ver, outgoing_retain): (bridge, address) = ssock.accept() bridge.settimeout(20) - if mosq_test.expect_packet(bridge, "connect", connect_packet): - bridge.send(connack_packet) + mosq_test.expect_packet(bridge, "connect", connect_packet) + bridge.send(connack_packet) - if mosq_test.expect_packet(bridge, "subscribe", subscribe_packet): - bridge.send(suback_packet) + mosq_test.expect_packet(bridge, "subscribe", subscribe_packet) + bridge.send(suback_packet) - # Broker is now connected to us on port1. - # Connect our client to the broker on port2 and send a publish - # message, which we will then receive by way of the bridge - helper = mosq_test.do_client_connect(helper_connect_packet, helper_connack_packet, port=port2) - helper.send(helper_publish_packet) - helper.close() + # Broker is now connected to us on port1. + # Connect our client to the broker on port2 and send a publish + # message, which we will then receive by way of the bridge + helper = mosq_test.do_client_connect(helper_connect_packet, helper_connack_packet, port=port2) + helper.send(helper_publish_packet) + helper.close() - if mosq_test.expect_packet(bridge, "publish", publish_packet): - rc = 0 + mosq_test.expect_packet(bridge, "publish", publish_packet) + rc = 0 bridge.close() + except mosq_test.TestError: + pass finally: os.remove(conf_file) try: diff --git a/test/broker/06-bridge-per-listener-settings.py b/test/broker/06-bridge-per-listener-settings.py index 9911066d..d91cc559 100755 --- a/test/broker/06-bridge-per-listener-settings.py +++ b/test/broker/06-bridge-per-listener-settings.py @@ -131,6 +131,8 @@ def do_test(proto_ver): sock.close() bridge.close() + except mosq_test.TestError: + pass finally: os.remove(conf_file) try: diff --git a/test/broker/06-bridge-reconnect-local-out.py b/test/broker/06-bridge-reconnect-local-out.py index ae7081f2..1ccf4351 100755 --- a/test/broker/06-bridge-reconnect-local-out.py +++ b/test/broker/06-bridge-reconnect-local-out.py @@ -84,10 +84,12 @@ def do_test(proto_ver): # End of helper # Should have now received a publish command - if mosq_test.expect_packet(sock, "publish", publish_packet): - rc = 0 + mosq_test.expect_packet(sock, "publish", publish_packet) + rc = 0 sock.close() + except mosq_test.TestError: + pass finally: os.remove(conf_file) time.sleep(1) diff --git a/test/broker/07-will-delay-reconnect.py b/test/broker/07-will-delay-reconnect.py index 2f435f36..5f06cc3c 100755 --- a/test/broker/07-will-delay-reconnect.py +++ b/test/broker/07-will-delay-reconnect.py @@ -49,6 +49,8 @@ def do_test(): sock1.close() sock2.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/07-will-delay-recover.py b/test/broker/07-will-delay-recover.py index 852c5499..54d23515 100755 --- a/test/broker/07-will-delay-recover.py +++ b/test/broker/07-will-delay-recover.py @@ -47,6 +47,8 @@ def do_test(clean_session): sock1.close() sock2.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/07-will-delay-session-expiry.py b/test/broker/07-will-delay-session-expiry.py index 833c84cc..241a912c 100755 --- a/test/broker/07-will-delay-session-expiry.py +++ b/test/broker/07-will-delay-session-expiry.py @@ -38,10 +38,12 @@ try: # Wait for session to expire time.sleep(3) - if mosq_test.expect_packet(sock1, "publish", publish_packet): - rc = 0 + mosq_test.expect_packet(sock1, "publish", publish_packet) + rc = 0 sock1.close() +except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/07-will-delay-session-expiry2.py b/test/broker/07-will-delay-session-expiry2.py index 506dac01..c8c34114 100755 --- a/test/broker/07-will-delay-session-expiry2.py +++ b/test/broker/07-will-delay-session-expiry2.py @@ -38,10 +38,12 @@ try: # Wait for session to expire time.sleep(3) - if mosq_test.expect_packet(sock1, "publish", publish_packet): - rc = 0 + mosq_test.expect_packet(sock1, "publish", publish_packet) + rc = 0 sock1.close() +except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/07-will-delay.py b/test/broker/07-will-delay.py index 796356dc..43b021fc 100755 --- a/test/broker/07-will-delay.py +++ b/test/broker/07-will-delay.py @@ -33,12 +33,14 @@ def do_test(clean_session): sock2.close() t_start = time.time() - if mosq_test.expect_packet(sock1, "publish", publish_packet): - t_finish = time.time() - if t_finish - t_start > 2 and t_finish - t_start < 5: - rc = 0 + mosq_test.expect_packet(sock1, "publish", publish_packet) + t_finish = time.time() + if t_finish - t_start > 2 and t_finish - t_start < 5: + rc = 0 sock1.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/07-will-disconnect-with-will.py b/test/broker/07-will-disconnect-with-will.py index 6bbd5429..d90c3e19 100755 --- a/test/broker/07-will-disconnect-with-will.py +++ b/test/broker/07-will-disconnect-with-will.py @@ -32,11 +32,13 @@ def do_test(): sock2 = mosq_test.do_client_connect(connect2_packet, connack2_packet, timeout=30, port=port) sock2.send(disconnect_packet) - if mosq_test.expect_packet(sock1, "publish", publish_packet): - rc = 0 + mosq_test.expect_packet(sock1, "publish", publish_packet) + rc = 0 sock2.close() sock1.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/07-will-invalid-utf8.py b/test/broker/07-will-invalid-utf8.py index 901003c2..96fce76e 100755 --- a/test/broker/07-will-invalid-utf8.py +++ b/test/broker/07-will-invalid-utf8.py @@ -21,6 +21,8 @@ def do_test(proto_ver): sock = mosq_test.do_client_connect(connect_packet, b"", timeout=30, port=port) rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/07-will-no-flag.py b/test/broker/07-will-no-flag.py index 6246557c..4a237357 100755 --- a/test/broker/07-will-no-flag.py +++ b/test/broker/07-will-no-flag.py @@ -23,6 +23,8 @@ def do_test(proto_ver): sock = mosq_test.do_client_connect(connect_packet, b"", port=port) sock.close() rc = 0 + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/07-will-null-topic.py b/test/broker/07-will-null-topic.py index fc41c1a1..5e1f42be 100755 --- a/test/broker/07-will-null-topic.py +++ b/test/broker/07-will-null-topic.py @@ -21,6 +21,8 @@ def do_test(proto_ver): if e.errno == errno.ECONNRESET: # Connection has been closed by peer, this is the expected behaviour rc = 0 + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/07-will-null.py b/test/broker/07-will-null.py index 1eba327d..8527a360 100755 --- a/test/broker/07-will-null.py +++ b/test/broker/07-will-null.py @@ -31,10 +31,12 @@ def do_test(proto_ver): helper(port, proto_ver) - if mosq_test.expect_packet(sock, "publish", publish_packet): - rc = 0 + mosq_test.expect_packet(sock, "publish", publish_packet) + rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/07-will-properties.py b/test/broker/07-will-properties.py index b9e78d01..ca07f163 100755 --- a/test/broker/07-will-properties.py +++ b/test/broker/07-will-properties.py @@ -34,10 +34,12 @@ def do_test(will_props, recvd_props): sock2 = mosq_test.do_client_connect(connect2_packet, connack2_packet, timeout=30, port=port) sock2.close() - if mosq_test.expect_packet(sock1, "publish", publish_packet): - rc = 0 + mosq_test.expect_packet(sock1, "publish", publish_packet) + rc = 0 sock1.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/07-will-qos0.py b/test/broker/07-will-qos0.py index 9d7e57f4..ae0ba27f 100755 --- a/test/broker/07-will-qos0.py +++ b/test/broker/07-will-qos0.py @@ -30,12 +30,12 @@ def do_test(proto_ver, clean_session): sock2 = mosq_test.do_client_connect(connect2_packet, connack2_packet, port=port, timeout=5) sock2.close() - if mosq_test.expect_packet(sock, "publish", publish_packet): - rc = 0 + mosq_test.expect_packet(sock, "publish", publish_packet) + rc = 0 sock.close() - except Exception as e: - print(e) + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/07-will-reconnect-1273.py b/test/broker/07-will-reconnect-1273.py index c2422a5e..336b25d8 100755 --- a/test/broker/07-will-reconnect-1273.py +++ b/test/broker/07-will-reconnect-1273.py @@ -57,6 +57,8 @@ def do_test(proto_ver): sock1.close() sock2.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/07-will-takeover.py b/test/broker/07-will-takeover.py index a9c83c4d..8e04b423 100755 --- a/test/broker/07-will-takeover.py +++ b/test/broker/07-will-takeover.py @@ -38,23 +38,25 @@ def do_test(proto_ver, clean_session): # Send a "ready" message sock2.send(publish_packet) - if mosq_test.expect_packet(sock1, "publish 1", publish_packet): + mosq_test.expect_packet(sock1, "publish 1", publish_packet) - # Connect client with will again as a separate connection, this should - # take over from the previous one but not trigger a Will. - sock3 = mosq_test.do_client_connect(connect2_packet, connack2b_packet, timeout=5, port=port) - sock2.close() + # Connect client with will again as a separate connection, this should + # take over from the previous one but not trigger a Will. + sock3 = mosq_test.do_client_connect(connect2_packet, connack2b_packet, timeout=5, port=port) + sock2.close() - # Send the "ready" message again - sock3.send(publish_packet) - if mosq_test.expect_packet(sock1, "publish 2", publish_packet): - # If the helper has received a will message, then the ping test will fail - mosq_test.do_ping(sock1) - rc = 0 + # Send the "ready" message again + sock3.send(publish_packet) + mosq_test.expect_packet(sock1, "publish 2", publish_packet) + # If the helper has received a will message, then the ping test will fail + mosq_test.do_ping(sock1) + rc = 0 sock1.close() sock2.close() sock3.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/08-ssl-bridge.py b/test/broker/08-ssl-bridge.py index a2641c36..0db962d1 100755 --- a/test/broker/08-ssl-bridge.py +++ b/test/broker/08-ssl-bridge.py @@ -44,20 +44,22 @@ try: (bridge, address) = ssock.accept() bridge.settimeout(20) - if mosq_test.expect_packet(bridge, "connect", connect_packet): - bridge.send(connack_packet) + mosq_test.expect_packet(bridge, "connect", connect_packet) + bridge.send(connack_packet) - if mosq_test.expect_packet(bridge, "subscribe", subscribe_packet): - bridge.send(suback_packet) + mosq_test.expect_packet(bridge, "subscribe", subscribe_packet) + bridge.send(suback_packet) - pub = subprocess.Popen(['./08-ssl-bridge-helper.py', str(port2)], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - pub.wait() - (stdo, stde) = pub.communicate() + pub = subprocess.Popen(['./08-ssl-bridge-helper.py', str(port2)], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + pub.wait() + (stdo, stde) = pub.communicate() - if mosq_test.expect_packet(bridge, "publish", publish_packet): - rc = 0 + mosq_test.expect_packet(bridge, "publish", publish_packet) + rc = 0 bridge.close() +except mosq_test.TestError: + pass finally: os.remove(conf_file) try: diff --git a/test/broker/08-ssl-connect-cert-auth-crl.py b/test/broker/08-ssl-connect-cert-auth-crl.py index 54d76c4f..512729b2 100755 --- a/test/broker/08-ssl-connect-cert-auth-crl.py +++ b/test/broker/08-ssl-connect-cert-auth-crl.py @@ -38,6 +38,8 @@ try: rc = 0 ssock.close() +except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/08-ssl-connect-cert-auth-expired.py b/test/broker/08-ssl-connect-cert-auth-expired.py index 6f3546c0..c7be02a4 100755 --- a/test/broker/08-ssl-connect-cert-auth-expired.py +++ b/test/broker/08-ssl-connect-cert-auth-expired.py @@ -42,6 +42,8 @@ try: else: broker.terminate() raise ValueError(err.errno) +except mosq_test.TestError: + pass finally: os.remove(conf_file) time.sleep(0.5) diff --git a/test/broker/08-ssl-connect-cert-auth-revoked.py b/test/broker/08-ssl-connect-cert-auth-revoked.py index 767b57c4..f6570b90 100755 --- a/test/broker/08-ssl-connect-cert-auth-revoked.py +++ b/test/broker/08-ssl-connect-cert-auth-revoked.py @@ -41,6 +41,8 @@ try: print(err.strerror) raise ValueError(err.errno) +except mosq_test.TestError: + pass finally: os.remove(conf_file) time.sleep(0.5) diff --git a/test/broker/08-ssl-connect-cert-auth-without.py b/test/broker/08-ssl-connect-cert-auth-without.py index cf8cb692..932dee29 100755 --- a/test/broker/08-ssl-connect-cert-auth-without.py +++ b/test/broker/08-ssl-connect-cert-auth-without.py @@ -39,6 +39,8 @@ except ssl.SSLError as err: except socket.error as err: if err.errno == errno.ECONNRESET: rc = 0 +except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/08-ssl-connect-cert-auth.py b/test/broker/08-ssl-connect-cert-auth.py index a39c5b10..bacdd639 100755 --- a/test/broker/08-ssl-connect-cert-auth.py +++ b/test/broker/08-ssl-connect-cert-auth.py @@ -39,6 +39,8 @@ try: rc = 0 ssock.close() +except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/08-ssl-connect-identity.py b/test/broker/08-ssl-connect-identity.py index e7d17a52..f1bc53d3 100755 --- a/test/broker/08-ssl-connect-identity.py +++ b/test/broker/08-ssl-connect-identity.py @@ -42,6 +42,8 @@ try: rc = 0 ssock.close() +except mosq_test.TestError: + pass finally: os.remove(conf_file) time.sleep(0.5) diff --git a/test/broker/08-ssl-connect-no-auth-wrong-ca.py b/test/broker/08-ssl-connect-no-auth-wrong-ca.py index 88365e05..30e3e313 100755 --- a/test/broker/08-ssl-connect-no-auth-wrong-ca.py +++ b/test/broker/08-ssl-connect-no-auth-wrong-ca.py @@ -36,6 +36,8 @@ try: except ssl.SSLError as err: if err.errno == 1: rc = 0 +except mosq_test.TestError: + pass finally: os.remove(conf_file) ssock.close() diff --git a/test/broker/08-ssl-connect-no-auth.py b/test/broker/08-ssl-connect-no-auth.py index f4f2f799..4fb568bb 100755 --- a/test/broker/08-ssl-connect-no-auth.py +++ b/test/broker/08-ssl-connect-no-auth.py @@ -39,6 +39,8 @@ try: rc = 0 ssock.close() +except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/08-ssl-connect-no-identity.py b/test/broker/08-ssl-connect-no-identity.py index 3e909bde..fcb8f4fc 100755 --- a/test/broker/08-ssl-connect-no-identity.py +++ b/test/broker/08-ssl-connect-no-identity.py @@ -41,6 +41,8 @@ try: rc = 0 ssock.close() +except mosq_test.TestError: + pass finally: os.remove(conf_file) time.sleep(2) diff --git a/test/broker/08-ssl-hup-disconnect.py b/test/broker/08-ssl-hup-disconnect.py index bd591823..b9bacd43 100755 --- a/test/broker/08-ssl-hup-disconnect.py +++ b/test/broker/08-ssl-hup-disconnect.py @@ -56,6 +56,8 @@ def do_test(option): rc = 0 ssock.close() + except mosq_test.TestError: + pass finally: os.remove(conf_file) os.remove(pw_file) diff --git a/test/broker/08-tls-psk-bridge.py b/test/broker/08-tls-psk-bridge.py index 25c753cc..67559338 100755 --- a/test/broker/08-tls-psk-bridge.py +++ b/test/broker/08-tls-psk-bridge.py @@ -68,10 +68,12 @@ try: raise ValueError (stdo, stde) = pub.communicate() - if mosq_test.expect_packet(sock, "publish", publish_packet): - rc = 0 + mosq_test.expect_packet(sock, "publish", publish_packet) + rc = 0 sock.close() +except mosq_test.TestError: + pass finally: os.remove(conf_file1) os.remove(conf_file2) diff --git a/test/broker/08-tls-psk-pub.py b/test/broker/08-tls-psk-pub.py index 5342810f..99d5b34b 100755 --- a/test/broker/08-tls-psk-pub.py +++ b/test/broker/08-tls-psk-pub.py @@ -53,10 +53,12 @@ try: raise ValueError (stdo, stde) = pub.communicate() - if mosq_test.expect_packet(sock, "publish", publish_packet): - rc = 0 + mosq_test.expect_packet(sock, "publish", publish_packet) + rc = 0 sock.close() +except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/09-acl-access-variants.py b/test/broker/09-acl-access-variants.py index f20a5eed..cdf41e10 100755 --- a/test/broker/09-acl-access-variants.py +++ b/test/broker/09-acl-access-variants.py @@ -56,6 +56,8 @@ def single_test(port, per_listener, username, topic, expect_deny): sock.close() rc = 0 + except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/09-acl-change.py b/test/broker/09-acl-change.py index 09d16f6b..e86ba634 100755 --- a/test/broker/09-acl-change.py +++ b/test/broker/09-acl-change.py @@ -110,6 +110,8 @@ try: sock.close() rc = 0 +except mosq_test.TestError: + pass finally: os.remove(conf_file) os.remove(acl_file) diff --git a/test/broker/09-acl-empty-file.py b/test/broker/09-acl-empty-file.py index ab02c248..0be4481b 100755 --- a/test/broker/09-acl-empty-file.py +++ b/test/broker/09-acl-empty-file.py @@ -47,6 +47,8 @@ def do_test(port, per_listener): rc = 0 sock.close() + except mosq_test.TestError: + pass finally: os.remove(conf_file) os.remove(acl_file) diff --git a/test/broker/09-auth-bad-method.py b/test/broker/09-auth-bad-method.py index 7ecde8dc..a5e76415 100755 --- a/test/broker/09-auth-bad-method.py +++ b/test/broker/09-auth-bad-method.py @@ -18,6 +18,8 @@ try: sock = mosq_test.do_client_connect(connect_packet, connack_packet, port=port) sock.close() rc = 0 +except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/09-extended-auth-change-username.py b/test/broker/09-extended-auth-change-username.py index b692a09c..361bbdf9 100755 --- a/test/broker/09-extended-auth-change-username.py +++ b/test/broker/09-extended-auth-change-username.py @@ -62,12 +62,14 @@ def do_test(per_listener): sock = mosq_test.do_client_connect(connect2_packet, connack2_packet, timeout=20, port=port) mosq_test.do_send_receive(sock, subscribe_packet, suback_packet, "suback2") mosq_test.do_send_receive(sock, publish2s_packet, puback2s_packet, "puback2") - if mosq_test.expect_packet(sock, "publish2", publish2r_packet): - mosq_test.do_ping(sock) - rc = 0 + mosq_test.expect_packet(sock, "publish2", publish2r_packet) + mosq_test.do_ping(sock) + rc = 0 sock.close() + except mosq_test.TestError: + pass finally: os.remove(conf_file) os.remove(acl_file) diff --git a/test/broker/09-extended-auth-multistep-reauth.py b/test/broker/09-extended-auth-multistep-reauth.py index e435f09f..bf140c9c 100755 --- a/test/broker/09-extended-auth-multistep-reauth.py +++ b/test/broker/09-extended-auth-multistep-reauth.py @@ -78,6 +78,8 @@ try: rc = 0 sock.close() +except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/09-extended-auth-multistep.py b/test/broker/09-extended-auth-multistep.py index d0916e6d..3b19f43c 100755 --- a/test/broker/09-extended-auth-multistep.py +++ b/test/broker/09-extended-auth-multistep.py @@ -40,6 +40,8 @@ try: rc = 0 sock.close() +except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/09-extended-auth-single.py b/test/broker/09-extended-auth-single.py index c7250158..57b21491 100755 --- a/test/broker/09-extended-auth-single.py +++ b/test/broker/09-extended-auth-single.py @@ -71,6 +71,8 @@ try: sock.close() rc = 0 +except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/09-extended-auth-single2.py b/test/broker/09-extended-auth-single2.py index 35da0432..8853c169 100755 --- a/test/broker/09-extended-auth-single2.py +++ b/test/broker/09-extended-auth-single2.py @@ -73,6 +73,8 @@ def do_test(suffix): sock.close() rc = 0 + except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/09-extended-auth-unsupported.py b/test/broker/09-extended-auth-unsupported.py index 4f365b5b..e154d287 100755 --- a/test/broker/09-extended-auth-unsupported.py +++ b/test/broker/09-extended-auth-unsupported.py @@ -21,6 +21,8 @@ try: rc = 0 sock.close() +except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/09-plugin-auth-acl-pub.py b/test/broker/09-plugin-auth-acl-pub.py index d546f95f..04a3c6ae 100755 --- a/test/broker/09-plugin-auth-acl-pub.py +++ b/test/broker/09-plugin-auth-acl-pub.py @@ -53,6 +53,8 @@ try: rc = 0 sock.close() +except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/09-plugin-auth-acl-sub-denied.py b/test/broker/09-plugin-auth-acl-sub-denied.py index 7046a315..24447848 100755 --- a/test/broker/09-plugin-auth-acl-sub-denied.py +++ b/test/broker/09-plugin-auth-acl-sub-denied.py @@ -40,6 +40,8 @@ try: rc = 0 sock.close() +except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/09-plugin-auth-acl-sub.py b/test/broker/09-plugin-auth-acl-sub.py index d4f76dd9..75f0a97e 100755 --- a/test/broker/09-plugin-auth-acl-sub.py +++ b/test/broker/09-plugin-auth-acl-sub.py @@ -38,6 +38,8 @@ try: rc = 0 sock.close() +except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/09-plugin-auth-context-params.py b/test/broker/09-plugin-auth-context-params.py index 00f6e24b..5614a868 100755 --- a/test/broker/09-plugin-auth-context-params.py +++ b/test/broker/09-plugin-auth-context-params.py @@ -37,6 +37,8 @@ try: rc = 0 sock.close() +except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/09-plugin-auth-defer-unpwd-fail.py b/test/broker/09-plugin-auth-defer-unpwd-fail.py index 1733e420..e3023a6e 100755 --- a/test/broker/09-plugin-auth-defer-unpwd-fail.py +++ b/test/broker/09-plugin-auth-defer-unpwd-fail.py @@ -25,6 +25,8 @@ try: sock = mosq_test.do_client_connect(connect_packet, connack_packet, timeout=20, port=port) rc = 0 sock.close() +except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/09-plugin-auth-defer-unpwd-success.py b/test/broker/09-plugin-auth-defer-unpwd-success.py index c8e1e02b..2df9e614 100755 --- a/test/broker/09-plugin-auth-defer-unpwd-success.py +++ b/test/broker/09-plugin-auth-defer-unpwd-success.py @@ -27,6 +27,8 @@ try: sock = mosq_test.do_client_connect(connect_packet, connack_packet, timeout=20, port=port) rc = 0 sock.close() +except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/09-plugin-auth-msg-params.py b/test/broker/09-plugin-auth-msg-params.py index 5b03a962..1d4eb28d 100755 --- a/test/broker/09-plugin-auth-msg-params.py +++ b/test/broker/09-plugin-auth-msg-params.py @@ -38,10 +38,12 @@ try: mosq_test.do_send_receive(sock, subscribe_packet, suback_packet, "suback") mosq_test.do_send_receive(sock, publish_packet, puback_packet, "puback") - if mosq_test.expect_packet(sock, "publish receive", publish_packet_recv): - rc = 0 + mosq_test.expect_packet(sock, "publish receive", publish_packet_recv) + rc = 0 sock.close() +except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/09-plugin-auth-unpwd-fail.py b/test/broker/09-plugin-auth-unpwd-fail.py index 812e9549..c156b9d1 100755 --- a/test/broker/09-plugin-auth-unpwd-fail.py +++ b/test/broker/09-plugin-auth-unpwd-fail.py @@ -27,6 +27,8 @@ try: rc = 0 sock.close() +except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/09-plugin-auth-unpwd-success.py b/test/broker/09-plugin-auth-unpwd-success.py index 834a7c0d..e8dbb032 100755 --- a/test/broker/09-plugin-auth-unpwd-success.py +++ b/test/broker/09-plugin-auth-unpwd-success.py @@ -26,6 +26,8 @@ try: sock = mosq_test.do_client_connect(connect_packet, connack_packet, timeout=20, port=port) rc = 0 sock.close() +except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/09-plugin-auth-v2-unpwd-fail.py b/test/broker/09-plugin-auth-v2-unpwd-fail.py index 4b6a1cdc..c5240f4e 100755 --- a/test/broker/09-plugin-auth-v2-unpwd-fail.py +++ b/test/broker/09-plugin-auth-v2-unpwd-fail.py @@ -27,6 +27,8 @@ try: rc = 0 sock.close() +except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/09-plugin-auth-v2-unpwd-success.py b/test/broker/09-plugin-auth-v2-unpwd-success.py index 7ffafca6..4b36c142 100755 --- a/test/broker/09-plugin-auth-v2-unpwd-success.py +++ b/test/broker/09-plugin-auth-v2-unpwd-success.py @@ -26,6 +26,8 @@ try: sock = mosq_test.do_client_connect(connect_packet, connack_packet, timeout=20, port=port) rc = 0 sock.close() +except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/09-pwfile-parse-invalid.py b/test/broker/09-pwfile-parse-invalid.py index f6b76bc5..0c4d05b9 100755 --- a/test/broker/09-pwfile-parse-invalid.py +++ b/test/broker/09-pwfile-parse-invalid.py @@ -33,6 +33,8 @@ def do_test(port, connack_rc, username, password): sock = mosq_test.do_client_connect(connect_packet, connack_packet, port=port) rc = 0 sock.close() + except mosq_test.TestError: + pass finally: if rc: raise AssertionError diff --git a/test/broker/10-listener-mount-point.py b/test/broker/10-listener-mount-point.py index 05ad183c..6388156c 100755 --- a/test/broker/10-listener-mount-point.py +++ b/test/broker/10-listener-mount-point.py @@ -48,10 +48,12 @@ def do_test(proto_ver): helper(port2, proto_ver) # Should have now received a publish command - if mosq_test.expect_packet(sock, "publish", publish_packet): - rc = 0 + mosq_test.expect_packet(sock, "publish", publish_packet) + rc = 0 sock.close() + except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/11-message-expiry.py b/test/broker/11-message-expiry.py index a18d837a..70e4d387 100755 --- a/test/broker/11-message-expiry.py +++ b/test/broker/11-message-expiry.py @@ -87,6 +87,8 @@ try: break sock.close() +except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/11-persistent-subscription-no-local.py b/test/broker/11-persistent-subscription-no-local.py index 96b3e38f..420de680 100755 --- a/test/broker/11-persistent-subscription-no-local.py +++ b/test/broker/11-persistent-subscription-no-local.py @@ -61,25 +61,27 @@ try: mosq_test.do_send_receive(sock, publish1_packet, puback1_packet, "puback1a") mosq_test.do_send_receive(sock, publish2s_packet, puback2s_packet, "puback2a") - if mosq_test.expect_packet(sock, "publish2a", publish2a_packet): - sock.send(puback2a_packet) + mosq_test.expect_packet(sock, "publish2a", publish2a_packet) + sock.send(puback2a_packet) - broker.terminate() - broker.wait() - (stdo1, stde1) = broker.communicate() - sock.close() + broker.terminate() + broker.wait() + (stdo1, stde1) = broker.communicate() + sock.close() - broker = mosq_test.start_broker(filename=os.path.basename(__file__), use_conf=True, port=port) + broker = mosq_test.start_broker(filename=os.path.basename(__file__), use_conf=True, port=port) - sock = mosq_test.do_client_connect(connect_packet, connack_packet2, timeout=20, port=port) + sock = mosq_test.do_client_connect(connect_packet, connack_packet2, timeout=20, port=port) - mosq_test.do_send_receive(sock, publish1_packet, puback1_packet, "puback1b") - mosq_test.do_send_receive(sock, publish2s_packet, puback2s_packet, "puback2b") + mosq_test.do_send_receive(sock, publish1_packet, puback1_packet, "puback1b") + mosq_test.do_send_receive(sock, publish2s_packet, puback2s_packet, "puback2b") - if mosq_test.expect_packet(sock, "publish2b", publish2b_packet): - rc = 0 + mosq_test.expect_packet(sock, "publish2b", publish2b_packet) + rc = 0 sock.close() +except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/11-persistent-subscription-v5.py b/test/broker/11-persistent-subscription-v5.py index d847ae19..02d8ef1e 100755 --- a/test/broker/11-persistent-subscription-v5.py +++ b/test/broker/11-persistent-subscription-v5.py @@ -54,10 +54,12 @@ try: mosq_test.do_send_receive(sock, publish_packet, puback_packet, "puback") - if mosq_test.expect_packet(sock, "publish2", publish_packet2): - rc = 0 + mosq_test.expect_packet(sock, "publish2", publish_packet2) + rc = 0 sock.close() +except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/11-persistent-subscription.py b/test/broker/11-persistent-subscription.py index 9cc38d80..eefbcc73 100755 --- a/test/broker/11-persistent-subscription.py +++ b/test/broker/11-persistent-subscription.py @@ -54,10 +54,12 @@ def do_test(proto_ver): mosq_test.do_send_receive(sock, publish_packet, puback_packet, "puback") - if mosq_test.expect_packet(sock, "publish2", publish_packet2): - rc = 0 + mosq_test.expect_packet(sock, "publish2", publish_packet2) + rc = 0 sock.close() + except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/11-pub-props.py b/test/broker/11-pub-props.py index 253cb55b..0a7fed3a 100755 --- a/test/broker/11-pub-props.py +++ b/test/broker/11-pub-props.py @@ -47,21 +47,23 @@ try: mosq_test.do_send_receive(sock, publish_packet, puback_packet, "puback") mosq_test.do_send_receive(sock, subscribe_packet, suback_packet, "suback") - if mosq_test.expect_packet(sock, "publish2", publish2_packet): + mosq_test.expect_packet(sock, "publish2", publish2_packet) - broker.terminate() - broker.wait() - (stdo1, stde1) = broker.communicate() - sock.close() - broker = mosq_test.start_broker(filename=os.path.basename(__file__), use_conf=True, port=port) + broker.terminate() + broker.wait() + (stdo1, stde1) = broker.communicate() + sock.close() + broker = mosq_test.start_broker(filename=os.path.basename(__file__), use_conf=True, port=port) - sock = mosq_test.do_client_connect(connect_packet, connack_packet, timeout=20, port=port) - mosq_test.do_send_receive(sock, subscribe_packet, suback_packet, "suback") + sock = mosq_test.do_client_connect(connect_packet, connack_packet, timeout=20, port=port) + mosq_test.do_send_receive(sock, subscribe_packet, suback_packet, "suback") - if mosq_test.expect_packet(sock, "publish2", publish2_packet): - rc = 0 + mosq_test.expect_packet(sock, "publish2", publish2_packet) + rc = 0 sock.close() +except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/11-subscription-id.py b/test/broker/11-subscription-id.py index 327b2b75..01b1c529 100755 --- a/test/broker/11-subscription-id.py +++ b/test/broker/11-subscription-id.py @@ -63,10 +63,12 @@ try: sock = mosq_test.do_client_connect(connect_packet, connack_packet2, timeout=20, port=port) - if mosq_test.expect_packet(sock, "publish2", publish_packet2): - rc = 0 + mosq_test.expect_packet(sock, "publish2", publish_packet2) + rc = 0 sock.close() +except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/12-prop-assigned-client-identifier.py b/test/broker/12-prop-assigned-client-identifier.py index 28f5037b..485692d6 100755 --- a/test/broker/12-prop-assigned-client-identifier.py +++ b/test/broker/12-prop-assigned-client-identifier.py @@ -37,6 +37,8 @@ def do_test(clean_start): rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/12-prop-maximum-packet-size-broker.py b/test/broker/12-prop-maximum-packet-size-broker.py index 43e6a19b..dba81949 100755 --- a/test/broker/12-prop-maximum-packet-size-broker.py +++ b/test/broker/12-prop-maximum-packet-size-broker.py @@ -29,6 +29,8 @@ try: sock = mosq_test.do_client_connect(connect_packet, connack_packet, port=port) mosq_test.do_send_receive(sock, publish_packet, disconnect_packet, "disconnect") rc = 0 +except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/12-prop-maximum-packet-size-connect.py b/test/broker/12-prop-maximum-packet-size-connect.py index 1d6582fe..e81c64f2 100755 --- a/test/broker/12-prop-maximum-packet-size-connect.py +++ b/test/broker/12-prop-maximum-packet-size-connect.py @@ -19,6 +19,8 @@ try: sock = mosq_test.do_client_connect(connect_packet, b"", port=port) # Exception occurs if connack packet returned rc = 0 +except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/12-prop-maximum-packet-size-publish-qos1.py b/test/broker/12-prop-maximum-packet-size-publish-qos1.py index 4fee7c76..88550369 100755 --- a/test/broker/12-prop-maximum-packet-size-publish-qos1.py +++ b/test/broker/12-prop-maximum-packet-size-publish-qos1.py @@ -38,8 +38,10 @@ try: mosq_test.do_send_receive(sock, publish2_packet, puback2_packet, "puback 2") - if mosq_test.expect_packet(sock, "publish2", publish2_packet): - rc = 0 + mosq_test.expect_packet(sock, "publish2", publish2_packet) + rc = 0 +except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/12-prop-maximum-packet-size-publish-qos2.py b/test/broker/12-prop-maximum-packet-size-publish-qos2.py index d7895202..4cfe237e 100755 --- a/test/broker/12-prop-maximum-packet-size-publish-qos2.py +++ b/test/broker/12-prop-maximum-packet-size-publish-qos2.py @@ -44,8 +44,10 @@ try: mosq_test.do_send_receive(sock, publish2_packet, pubrec2_packet, "pubrec 2") mosq_test.do_send_receive(sock, pubrel2_packet, pubcomp2_packet, "pubcomp 2") - if mosq_test.expect_packet(sock, "publish2", publish2_packet): - rc = 0 + mosq_test.expect_packet(sock, "publish2", publish2_packet) + rc = 0 +except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/12-prop-maximum-packet-size-publish.py b/test/broker/12-prop-maximum-packet-size-publish.py index dca9e34e..dde7a8da 100755 --- a/test/broker/12-prop-maximum-packet-size-publish.py +++ b/test/broker/12-prop-maximum-packet-size-publish.py @@ -31,6 +31,8 @@ try: mosq_test.do_send_receive(sock, publish2_packet, publish2_packet) mosq_test.do_ping(sock, "pingresp2") rc = 0 +except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/12-prop-response-topic-correlation-data.py b/test/broker/12-prop-response-topic-correlation-data.py index 18d50a48..2c7a0f86 100755 --- a/test/broker/12-prop-response-topic-correlation-data.py +++ b/test/broker/12-prop-response-topic-correlation-data.py @@ -41,14 +41,16 @@ try: mosq_test.do_send_receive(sock2, subscribe_packet2, suback_packet, "subscribe2") sock2.send(publish_packet2) - if mosq_test.expect_packet(sock1, "publish1", publish_packet2): - # FIXME - it would be better to extract the property and payload, even though we know them - sock1.send(publish_packet1) - if mosq_test.expect_packet(sock2, "publish2", publish_packet1): - rc = 0 + mosq_test.expect_packet(sock1, "publish1", publish_packet2) + # FIXME - it would be better to extract the property and payload, even though we know them + sock1.send(publish_packet1) + mosq_test.expect_packet(sock2, "publish2", publish_packet1) + rc = 0 sock1.close() sock2.close() +except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/12-prop-response-topic.py b/test/broker/12-prop-response-topic.py index 2a4ea7ba..2ff6e127 100755 --- a/test/broker/12-prop-response-topic.py +++ b/test/broker/12-prop-response-topic.py @@ -40,14 +40,16 @@ try: mosq_test.do_send_receive(sock2, subscribe_packet2, suback_packet, "subscribe2") sock2.send(publish_packet2) - if mosq_test.expect_packet(sock1, "publish1", publish_packet2): - # FIXME - it would be better to extract the property and payload, even though we know them - sock1.send(publish_packet1) - if mosq_test.expect_packet(sock2, "publish2", publish_packet1): - rc = 0 + mosq_test.expect_packet(sock1, "publish1", publish_packet2) + # FIXME - it would be better to extract the property and payload, even though we know them + sock1.send(publish_packet1) + mosq_test.expect_packet(sock2, "publish2", publish_packet1) + rc = 0 sock1.close() sock2.close() +except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/12-prop-server-keepalive.py b/test/broker/12-prop-server-keepalive.py index 31d92a40..25b71107 100755 --- a/test/broker/12-prop-server-keepalive.py +++ b/test/broker/12-prop-server-keepalive.py @@ -30,6 +30,8 @@ try: sock = mosq_test.do_client_connect(connect_packet, connack_packet, port=port) sock.close() rc = 0 +except mosq_test.TestError: + pass finally: os.remove(conf_file) broker.terminate() diff --git a/test/broker/12-prop-session-expiry-invalid.py b/test/broker/12-prop-session-expiry-invalid.py index afc87065..d27b42b9 100755 --- a/test/broker/12-prop-session-expiry-invalid.py +++ b/test/broker/12-prop-session-expiry-invalid.py @@ -26,6 +26,8 @@ try: mosq_test.do_send_receive(sock, disconnect_client_packet, disconnect_server_packet, "disconnect") sock.close() rc = 0 +except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/12-prop-topic-alias-invalid.py b/test/broker/12-prop-topic-alias-invalid.py index 877a8954..03ac6084 100755 --- a/test/broker/12-prop-topic-alias-invalid.py +++ b/test/broker/12-prop-topic-alias-invalid.py @@ -22,8 +22,10 @@ def do_test(value): try: sock = mosq_test.do_client_connect(connect_packet, connack_packet, port=port) sock.send(publish_packet) - if mosq_test.expect_packet(sock, "disconnect", disconnect_packet): - rc = 0 + mosq_test.expect_packet(sock, "disconnect", disconnect_packet) + rc = 0 + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/13-malformed-publish-v5.py b/test/broker/13-malformed-publish-v5.py index e40975a6..881aaf21 100755 --- a/test/broker/13-malformed-publish-v5.py +++ b/test/broker/13-malformed-publish-v5.py @@ -83,6 +83,8 @@ try: # Bad topic publish_packet = mosq_test.gen_publish(topic="#/test/topic", qos=1, mid=1, proto_ver=5) do_test(publish_packet, mqtt5_rc.MQTT_RC_PROTOCOL_ERROR, "Bad topic") +except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/13-malformed-subscribe-v5.py b/test/broker/13-malformed-subscribe-v5.py index 4b70bbfa..8109d5a0 100755 --- a/test/broker/13-malformed-subscribe-v5.py +++ b/test/broker/13-malformed-subscribe-v5.py @@ -89,6 +89,8 @@ try: props = mqtt5_props.gen_varint_prop(mqtt5_props.PROP_SUBSCRIPTION_IDENTIFIER, 0) subscribe_packet = mosq_test.gen_subscribe(topic="test/topic", qos=1, mid=1, proto_ver=5, properties=props) do_test(subscribe_packet, mqtt5_rc.MQTT_RC_MALFORMED_PACKET, "Subscription ID set to 0") +except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/13-malformed-unsubscribe-v5.py b/test/broker/13-malformed-unsubscribe-v5.py index e23f361b..c6037dbf 100755 --- a/test/broker/13-malformed-unsubscribe-v5.py +++ b/test/broker/13-malformed-unsubscribe-v5.py @@ -60,6 +60,8 @@ try: # Bad topic unsubscribe_packet = mosq_test.gen_unsubscribe(topic="#/test/topic", mid=1, proto_ver=5) do_test(unsubscribe_packet, mqtt5_rc.MQTT_RC_MALFORMED_PACKET, "Bad topic") +except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/broker/prop_subpub_helper.py b/test/broker/prop_subpub_helper.py index 9059f314..e85348b9 100755 --- a/test/broker/prop_subpub_helper.py +++ b/test/broker/prop_subpub_helper.py @@ -32,6 +32,8 @@ def prop_subpub_helper(props_out, props_in): rc = 0 sock.close() + except mosq_test.TestError: + pass finally: broker.terminate() broker.wait() diff --git a/test/lib/01-con-discon-success.py b/test/lib/01-con-discon-success.py index 469ecb11..7f6298b9 100755 --- a/test/lib/01-con-discon-success.py +++ b/test/lib/01-con-discon-success.py @@ -40,13 +40,13 @@ try: (conn, address) = sock.accept() conn.settimeout(10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) - - if mosq_test.expect_packet(conn, "disconnect", disconnect_packet): - rc = 0 + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") + mosq_test.expect_packet(conn, "disconnect", disconnect_packet) + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: #client.terminate() client.wait() diff --git a/test/lib/01-keepalive-pingreq.py b/test/lib/01-keepalive-pingreq.py index e3962b0b..7e1c46e1 100755 --- a/test/lib/01-keepalive-pingreq.py +++ b/test/lib/01-keepalive-pingreq.py @@ -39,17 +39,18 @@ try: (conn, address) = sock.accept() conn.settimeout(keepalive+10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") - if mosq_test.expect_packet(conn, "pingreq", pingreq_packet): - time.sleep(1.0) - conn.send(pingresp_packet) + mosq_test.expect_packet(conn, "pingreq", pingreq_packet) + time.sleep(1.0) + conn.send(pingresp_packet) - if mosq_test.expect_packet(conn, "pingreq", pingreq_packet): - rc = 0 + mosq_test.expect_packet(conn, "pingreq", pingreq_packet) + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: client.terminate() client.wait() diff --git a/test/lib/01-no-clean-session.py b/test/lib/01-no-clean-session.py index 29ea42d4..48afc9ec 100755 --- a/test/lib/01-no-clean-session.py +++ b/test/lib/01-no-clean-session.py @@ -33,10 +33,12 @@ try: (conn, address) = sock.accept() conn.settimeout(10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - rc = 0 + mosq_test.expect_packet(conn, "connect", connect_packet) + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: client.terminate() client.wait() diff --git a/test/lib/01-server-keepalive-pingreq.py b/test/lib/01-server-keepalive-pingreq.py index d375c97c..6944cdb0 100755 --- a/test/lib/01-server-keepalive-pingreq.py +++ b/test/lib/01-server-keepalive-pingreq.py @@ -39,17 +39,18 @@ try: (conn, address) = sock.accept() conn.settimeout(server_keepalive+10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") - if mosq_test.expect_packet(conn, "pingreq", pingreq_packet): - time.sleep(1.0) - conn.send(pingresp_packet) + mosq_test.expect_packet(conn, "pingreq", pingreq_packet) + time.sleep(1.0) + conn.send(pingresp_packet) - if mosq_test.expect_packet(conn, "pingreq", pingreq_packet): - rc = 0 + mosq_test.expect_packet(conn, "pingreq", pingreq_packet) + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: client.terminate() client.wait() diff --git a/test/lib/01-unpwd-set.py b/test/lib/01-unpwd-set.py index 6d4ad190..fdfa9eab 100755 --- a/test/lib/01-unpwd-set.py +++ b/test/lib/01-unpwd-set.py @@ -33,10 +33,12 @@ try: (conn, address) = sock.accept() conn.settimeout(10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - rc = 0 + mosq_test.expect_packet(conn, "connect", connect_packet) + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: client.terminate() client.wait() diff --git a/test/lib/01-will-set.py b/test/lib/01-will-set.py index af9ae789..ef990068 100755 --- a/test/lib/01-will-set.py +++ b/test/lib/01-will-set.py @@ -35,10 +35,12 @@ try: (conn, address) = sock.accept() conn.settimeout(10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - rc = 0 + mosq_test.expect_packet(conn, "connect", connect_packet) + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: client.terminate() client.wait() diff --git a/test/lib/01-will-unpwd-set.py b/test/lib/01-will-unpwd-set.py index 534d2670..1cc192a3 100755 --- a/test/lib/01-will-unpwd-set.py +++ b/test/lib/01-will-unpwd-set.py @@ -37,10 +37,12 @@ try: (conn, address) = sock.accept() conn.settimeout(10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - rc = 0 + mosq_test.expect_packet(conn, "connect", connect_packet) + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: client.terminate() client.wait() diff --git a/test/lib/02-subscribe-qos0.py b/test/lib/02-subscribe-qos0.py index 692c6e6e..ceb6a63a 100755 --- a/test/lib/02-subscribe-qos0.py +++ b/test/lib/02-subscribe-qos0.py @@ -47,16 +47,14 @@ try: (conn, address) = sock.accept() conn.settimeout(10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) - - if mosq_test.expect_packet(conn, "subscribe", subscribe_packet): - conn.send(suback_packet) - - if mosq_test.expect_packet(conn, "disconnect", disconnect_packet): - rc = 0 + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") + mosq_test.do_receive_send(conn, subscribe_packet, suback_packet, "subscribe") + mosq_test.expect_packet(conn, "disconnect", disconnect_packet) + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: client.terminate() client.wait() diff --git a/test/lib/02-subscribe-qos1.py b/test/lib/02-subscribe-qos1.py index 4e237d51..04be887f 100755 --- a/test/lib/02-subscribe-qos1.py +++ b/test/lib/02-subscribe-qos1.py @@ -47,16 +47,14 @@ try: (conn, address) = sock.accept() conn.settimeout(10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) - - if mosq_test.expect_packet(conn, "subscribe", subscribe_packet): - conn.send(suback_packet) - - if mosq_test.expect_packet(conn, "disconnect", disconnect_packet): - rc = 0 + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") + mosq_test.do_receive_send(conn, subscribe_packet, suback_packet, "subscribe") + mosq_test.expect_packet(conn, "disconnect", disconnect_packet) + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: client.terminate() client.wait() diff --git a/test/lib/02-subscribe-qos2.py b/test/lib/02-subscribe-qos2.py index 2c41e359..14beb49b 100755 --- a/test/lib/02-subscribe-qos2.py +++ b/test/lib/02-subscribe-qos2.py @@ -47,16 +47,14 @@ try: (conn, address) = sock.accept() conn.settimeout(10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) - - if mosq_test.expect_packet(conn, "subscribe", subscribe_packet): - conn.send(suback_packet) - - if mosq_test.expect_packet(conn, "disconnect", disconnect_packet): - rc = 0 + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") + mosq_test.do_receive_send(conn, subscribe_packet, suback_packet, "subscribe") + mosq_test.expect_packet(conn, "disconnect", disconnect_packet) + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: client.terminate() client.wait() diff --git a/test/lib/02-unsubscribe-multiple-v5.py b/test/lib/02-unsubscribe-multiple-v5.py index ab50b93a..b2e7bf88 100755 --- a/test/lib/02-unsubscribe-multiple-v5.py +++ b/test/lib/02-unsubscribe-multiple-v5.py @@ -42,19 +42,15 @@ try: (conn, address) = sock.accept() conn.settimeout(10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) - - if mosq_test.expect_packet(conn, "subscribe", subscribe_packet): - conn.send(suback_packet) - - if mosq_test.expect_packet(conn, "unsubscribe", unsubscribe_packet): - conn.send(unsuback_packet) - - if mosq_test.expect_packet(conn, "disconnect", disconnect_packet): - rc = 0 + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") + mosq_test.do_receive_send(conn, subscribe_packet, suback_packet, "subscribe") + mosq_test.do_receive_send(conn, unsubscribe_packet, unsuback_packet, "unsubscribe") + mosq_test.expect_packet(conn, "disconnect", disconnect_packet) + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: client.terminate() client.wait() diff --git a/test/lib/02-unsubscribe-v5.py b/test/lib/02-unsubscribe-v5.py index 32d565ab..b5c9463a 100755 --- a/test/lib/02-unsubscribe-v5.py +++ b/test/lib/02-unsubscribe-v5.py @@ -36,16 +36,14 @@ try: (conn, address) = sock.accept() conn.settimeout(10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) - - if mosq_test.expect_packet(conn, "unsubscribe", unsubscribe_packet): - conn.send(unsuback_packet) - - if mosq_test.expect_packet(conn, "disconnect", disconnect_packet): - rc = 0 + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") + mosq_test.do_receive_send(conn, unsubscribe_packet, unsuback_packet, "unsubscribe") + mosq_test.expect_packet(conn, "disconnect", disconnect_packet) + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: client.terminate() client.wait() diff --git a/test/lib/02-unsubscribe.py b/test/lib/02-unsubscribe.py index 39aa05bc..80ea6cea 100755 --- a/test/lib/02-unsubscribe.py +++ b/test/lib/02-unsubscribe.py @@ -37,16 +37,14 @@ try: (conn, address) = sock.accept() conn.settimeout(10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) - - if mosq_test.expect_packet(conn, "unsubscribe", unsubscribe_packet): - conn.send(unsuback_packet) - - if mosq_test.expect_packet(conn, "disconnect", disconnect_packet): - rc = 0 + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") + mosq_test.do_receive_send(conn, unsubscribe_packet, unsuback_packet, "unsubscribe") + mosq_test.expect_packet(conn, "disconnect", disconnect_packet) + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: client.terminate() client.wait() diff --git a/test/lib/03-publish-b2c-qos1.py b/test/lib/03-publish-b2c-qos1.py index 0d01cbe7..7c812943 100755 --- a/test/lib/03-publish-b2c-qos1.py +++ b/test/lib/03-publish-b2c-qos1.py @@ -46,14 +46,13 @@ try: (conn, address) = sock.accept() conn.settimeout(10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) - conn.send(publish_packet) - - if mosq_test.expect_packet(conn, "puback", puback_packet): - rc = 0 + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") + mosq_test.do_send_receive(conn, publish_packet, puback_packet, "puback") + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: for i in range(0, 5): if client.returncode != None: diff --git a/test/lib/03-publish-b2c-qos2-len.py b/test/lib/03-publish-b2c-qos2-len.py index fe379774..f560c2b2 100755 --- a/test/lib/03-publish-b2c-qos2-len.py +++ b/test/lib/03-publish-b2c-qos2-len.py @@ -42,15 +42,17 @@ def len_test(test, pubrel_packet): (conn, address) = sock.accept() conn.settimeout(15) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) + mosq_test.expect_packet(conn, "connect", connect_packet) + conn.send(connack_packet) - mosq_test.do_send_receive(conn, publish_packet, pubrec_packet, "pubrec") - mosq_test.do_send_receive(conn, pubrel_packet, pubcomp_packet, "pubcomp") - if mosq_test.expect_packet(conn, "disconnect", disconnect_packet): - rc = 0 + mosq_test.do_send_receive(conn, publish_packet, pubrec_packet, "pubrec") + mosq_test.do_send_receive(conn, pubrel_packet, pubcomp_packet, "pubcomp") + mosq_test.expect_packet(conn, "disconnect", disconnect_packet) + rc = 0 conn.close() + except mosq_test.TestError: + pass finally: client.terminate() client.wait() diff --git a/test/lib/03-publish-b2c-qos2.py b/test/lib/03-publish-b2c-qos2.py index 32589db7..6cd148fa 100755 --- a/test/lib/03-publish-b2c-qos2.py +++ b/test/lib/03-publish-b2c-qos2.py @@ -53,17 +53,14 @@ try: (conn, address) = sock.accept() conn.settimeout(10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) - conn.send(publish_packet) - - if mosq_test.expect_packet(conn, "pubrec", pubrec_packet): - conn.send(pubrel_packet) - - if mosq_test.expect_packet(conn, "pubcomp", pubcomp_packet): - rc = 0 + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") + mosq_test.do_send_receive(conn, publish_packet, pubrec_packet, "pubrec") + mosq_test.do_send_receive(conn, pubrel_packet, pubcomp_packet, "pubcomp") + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: for i in range(0, 5): if client.returncode != None: diff --git a/test/lib/03-publish-c2b-qos1-disconnect.py b/test/lib/03-publish-c2b-qos1-disconnect.py index 2900489b..cc970e9c 100755 --- a/test/lib/03-publish-c2b-qos1-disconnect.py +++ b/test/lib/03-publish-c2b-qos1-disconnect.py @@ -39,26 +39,24 @@ try: (conn, address) = sock.accept() conn.settimeout(15) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) + mosq_test.expect_packet(conn, "connect", connect_packet) + conn.send(connack_packet) - if mosq_test.expect_packet(conn, "publish", publish_packet): - # Disconnect client. It should reconnect. - conn.close() + mosq_test.expect_packet(conn, "publish", publish_packet) + # Disconnect client. It should reconnect. + conn.close() - (conn, address) = sock.accept() - conn.settimeout(15) + (conn, address) = sock.accept() + conn.settimeout(15) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) - - if mosq_test.expect_packet(conn, "retried publish", publish_packet_dup): - conn.send(puback_packet) - - if mosq_test.expect_packet(conn, "disconnect", disconnect_packet): - rc = 0 + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") + mosq_test.do_receive_send(conn, publish_packet_dup, puback_packet, "retried publish") + mosq_test.expect_packet(conn, "disconnect", disconnect_packet) + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: client.terminate() client.wait() diff --git a/test/lib/03-publish-c2b-qos1-len.py b/test/lib/03-publish-c2b-qos1-len.py index a3107b3b..d797deed 100755 --- a/test/lib/03-publish-c2b-qos1-len.py +++ b/test/lib/03-publish-c2b-qos1-len.py @@ -39,16 +39,14 @@ def len_test(test, puback_packet): (conn, address) = sock.accept() conn.settimeout(15) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) - - if mosq_test.expect_packet(conn, "publish", publish_packet): - conn.send(puback_packet) - - if mosq_test.expect_packet(conn, "disconnect", disconnect_packet): - rc = 0 + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") + mosq_test.do_receive_send(conn, publish_packet, puback_packet, "publish") + mosq_test.expect_packet(conn, "disconnect", disconnect_packet) + rc = 0 conn.close() + except mosq_test.TestError: + pass finally: client.terminate() client.wait() diff --git a/test/lib/03-publish-c2b-qos1-receive-maximum.py b/test/lib/03-publish-c2b-qos1-receive-maximum.py index 8a09e5e8..1f13d0c2 100755 --- a/test/lib/03-publish-c2b-qos1-receive-maximum.py +++ b/test/lib/03-publish-c2b-qos1-receive-maximum.py @@ -63,26 +63,27 @@ try: (conn, address) = sock.accept() conn.settimeout(10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") - if mosq_test.expect_packet(conn, "publish 1", publish_1_packet): - if mosq_test.expect_packet(conn, "publish 2", publish_2_packet): - if mosq_test.expect_packet(conn, "publish 3", publish_3_packet): - conn.send(puback_1_packet) - conn.send(puback_2_packet) + mosq_test.expect_packet(conn, "publish 1", publish_1_packet) + mosq_test.expect_packet(conn, "publish 2", publish_2_packet) + mosq_test.expect_packet(conn, "publish 3", publish_3_packet) + conn.send(puback_1_packet) + conn.send(puback_2_packet) - if mosq_test.expect_packet(conn, "publish 4", publish_4_packet): - if mosq_test.expect_packet(conn, "publish 5", publish_5_packet): - conn.send(puback_3_packet) + mosq_test.expect_packet(conn, "publish 4", publish_4_packet) + mosq_test.expect_packet(conn, "publish 5", publish_5_packet) + conn.send(puback_3_packet) - if mosq_test.expect_packet(conn, "publish 6", publish_6_packet): - conn.send(puback_4_packet) - conn.send(puback_5_packet) - conn.send(puback_6_packet) - rc = 0 + mosq_test.expect_packet(conn, "publish 6", publish_6_packet) + conn.send(puback_4_packet) + conn.send(puback_5_packet) + conn.send(puback_6_packet) + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: for i in range(0, 5): if client.returncode != None: diff --git a/test/lib/03-publish-c2b-qos1-timeout.py b/test/lib/03-publish-c2b-qos1-timeout.py index 73889ce0..ff21d03d 100755 --- a/test/lib/03-publish-c2b-qos1-timeout.py +++ b/test/lib/03-publish-c2b-qos1-timeout.py @@ -52,19 +52,19 @@ try: (conn, address) = sock.accept() conn.settimeout(10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") - if mosq_test.expect_packet(conn, "publish", publish_packet): - # Delay for > 3 seconds (message retry time) + mosq_test.expect_packet(conn, "publish", publish_packet) + # Delay for > 3 seconds (message retry time) - if mosq_test.expect_packet(conn, "dup publish", publish_packet_dup): - conn.send(puback_packet) + mosq_test.do_receive_send(conn, publish_packet_dup, puback_packet, "dup publish") - if mosq_test.expect_packet(conn, "disconnect", disconnect_packet): - rc = 0 + mosq_test.expect_packet(conn, "disconnect", disconnect_packet) + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: client.terminate() client.wait() diff --git a/test/lib/03-publish-c2b-qos2-disconnect.py b/test/lib/03-publish-c2b-qos2-disconnect.py index ee8ed3cb..24b838a3 100755 --- a/test/lib/03-publish-c2b-qos2-disconnect.py +++ b/test/lib/03-publish-c2b-qos2-disconnect.py @@ -40,40 +40,35 @@ try: (conn, address) = sock.accept() conn.settimeout(10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") - if mosq_test.expect_packet(conn, "publish", publish_packet): - # Disconnect client. It should reconnect. - conn.close() + mosq_test.expect_packet(conn, "publish", publish_packet) + # Disconnect client. It should reconnect. + conn.close() - (conn, address) = sock.accept() - conn.settimeout(15) + (conn, address) = sock.accept() + conn.settimeout(15) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") + mosq_test.do_receive_send(conn, publish_dup_packet, pubrec_packet, "retried publish") - if mosq_test.expect_packet(conn, "retried publish", publish_dup_packet): - conn.send(pubrec_packet) + mosq_test.expect_packet(conn, "pubrel", pubrel_packet) + # Disconnect client. It should reconnect. + conn.close() - if mosq_test.expect_packet(conn, "pubrel", pubrel_packet): - # Disconnect client. It should reconnect. - conn.close() + (conn, address) = sock.accept() + conn.settimeout(15) - (conn, address) = sock.accept() - conn.settimeout(15) + # Complete connection and message flow. + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") + mosq_test.do_receive_send(conn, pubrel_packet, pubcomp_packet, "retried pubrel") - # Complete connection and message flow. - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) - - if mosq_test.expect_packet(conn, "retried pubrel", pubrel_packet): - conn.send(pubcomp_packet) - - if mosq_test.expect_packet(conn, "disconnect", disconnect_packet): - rc = 0 + mosq_test.expect_packet(conn, "disconnect", disconnect_packet) + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: client.terminate() client.wait() diff --git a/test/lib/03-publish-c2b-qos2-len.py b/test/lib/03-publish-c2b-qos2-len.py index 12fd27af..ac0a1e2e 100755 --- a/test/lib/03-publish-c2b-qos2-len.py +++ b/test/lib/03-publish-c2b-qos2-len.py @@ -40,19 +40,15 @@ def len_test(test, pubrec_packet, pubcomp_packet): (conn, address) = sock.accept() conn.settimeout(15) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) - - if mosq_test.expect_packet(conn, "publish", publish_packet): - conn.send(pubrec_packet) - - if mosq_test.expect_packet(conn, "pubrel", pubrel_packet): - conn.send(pubcomp_packet) - - if mosq_test.expect_packet(conn, "disconnect", disconnect_packet): - rc = 0 + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") + mosq_test.do_receive_send(conn, publish_packet, pubrec_packet, "publish") + mosq_test.do_receive_send(conn, pubrel_packet, pubcomp_packet, "pubrel") + mosq_test.expect_packet(conn, "disconnect", disconnect_packet) + rc = 0 conn.close() + except mosq_test.TestError: + pass finally: client.terminate() client.wait() diff --git a/test/lib/03-publish-c2b-qos2-maximum-qos-0.py b/test/lib/03-publish-c2b-qos2-maximum-qos-0.py index 224b85a0..c80196ba 100755 --- a/test/lib/03-publish-c2b-qos2-maximum-qos-0.py +++ b/test/lib/03-publish-c2b-qos2-maximum-qos-0.py @@ -41,14 +41,14 @@ try: (conn, address) = sock.accept() conn.settimeout(10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) - - if mosq_test.expect_packet(conn, "publish 1", publish_1_packet): - if mosq_test.expect_packet(conn, "disconnect", disconnect_packet): - rc = 0 + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") + mosq_test.expect_packet(conn, "publish 1", publish_1_packet) + mosq_test.expect_packet(conn, "disconnect", disconnect_packet) + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: for i in range(0, 5): if client.returncode != None: diff --git a/test/lib/03-publish-c2b-qos2-maximum-qos-1.py b/test/lib/03-publish-c2b-qos2-maximum-qos-1.py index b93cab05..9bb4a63c 100755 --- a/test/lib/03-publish-c2b-qos2-maximum-qos-1.py +++ b/test/lib/03-publish-c2b-qos2-maximum-qos-1.py @@ -45,16 +45,16 @@ try: (conn, address) = sock.accept() conn.settimeout(10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") + mosq_test.do_receive_send(conn, publish_1_packet, puback_1_packet, "publish 1") - if mosq_test.expect_packet(conn, "publish 1", publish_1_packet): - conn.send(puback_1_packet) - if mosq_test.expect_packet(conn, "publish 2", publish_2_packet): - if mosq_test.expect_packet(conn, "disconnect", disconnect_packet): - rc = 0 + mosq_test.expect_packet(conn, "publish 2", publish_2_packet) + mosq_test.expect_packet(conn, "disconnect", disconnect_packet) + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: for i in range(0, 5): if client.returncode != None: diff --git a/test/lib/03-publish-c2b-qos2-pubrec-error.py b/test/lib/03-publish-c2b-qos2-pubrec-error.py index 67c7a872..c9ae5b64 100755 --- a/test/lib/03-publish-c2b-qos2-pubrec-error.py +++ b/test/lib/03-publish-c2b-qos2-pubrec-error.py @@ -52,20 +52,16 @@ try: (conn, address) = sock.accept() conn.settimeout(10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") + mosq_test.do_receive_send(conn, publish_1_packet, pubrec_1_packet, "publish 1") + mosq_test.do_receive_send(conn, publish_2_packet, pubrec_2_packet, "publish 2") + mosq_test.do_receive_send(conn, pubrel_2_packet, pubcomp_2_packet, "pubrel 2") - if mosq_test.expect_packet(conn, "publish 1", publish_1_packet): - conn.send(pubrec_1_packet) - - if mosq_test.expect_packet(conn, "publish 2", publish_2_packet): - conn.send(pubrec_2_packet) - - if mosq_test.expect_packet(conn, "pubrel 2", pubrel_2_packet): - conn.send(pubcomp_2_packet) - rc = 0 + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: for i in range(0, 5): if client.returncode != None: diff --git a/test/lib/03-publish-c2b-qos2-receive-maximum-1.py b/test/lib/03-publish-c2b-qos2-receive-maximum-1.py index c56c7071..c71ae776 100755 --- a/test/lib/03-publish-c2b-qos2-receive-maximum-1.py +++ b/test/lib/03-publish-c2b-qos2-receive-maximum-1.py @@ -69,36 +69,28 @@ try: (conn, address) = sock.accept() conn.settimeout(10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") - if mosq_test.expect_packet(conn, "publish 1", publish_1_packet): - conn.send(pubrec_1_packet) - if mosq_test.expect_packet(conn, "pubrel 1", pubrel_1_packet): - conn.send(pubcomp_1_packet) + mosq_test.do_receive_send(conn, publish_1_packet, pubrec_1_packet, "publish 1") + mosq_test.do_receive_send(conn, pubrel_1_packet, pubcomp_1_packet, "pubrel 1") - if mosq_test.expect_packet(conn, "publish 2", publish_2_packet): - conn.send(pubrec_2_packet) - if mosq_test.expect_packet(conn, "pubrel 2", pubrel_2_packet): - conn.send(pubcomp_2_packet) + mosq_test.do_receive_send(conn, publish_2_packet, pubrec_2_packet, "publish 2") + mosq_test.do_receive_send(conn, pubrel_2_packet, pubcomp_2_packet, "pubrel 2") - if mosq_test.expect_packet(conn, "publish 3", publish_3_packet): - conn.send(pubrec_3_packet) - if mosq_test.expect_packet(conn, "pubrel 3", pubrel_3_packet): - conn.send(pubcomp_3_packet) + mosq_test.do_receive_send(conn, publish_3_packet, pubrec_3_packet, "publish 3") + mosq_test.do_receive_send(conn, pubrel_3_packet, pubcomp_3_packet, "pubrel 3") - if mosq_test.expect_packet(conn, "publish 4", publish_4_packet): - conn.send(pubrec_4_packet) - if mosq_test.expect_packet(conn, "pubrel 4", pubrel_4_packet): - conn.send(pubcomp_4_packet) + mosq_test.do_receive_send(conn, publish_4_packet, pubrec_4_packet, "publish 4") + mosq_test.do_receive_send(conn, pubrel_4_packet, pubcomp_4_packet, "pubrel 4") - if mosq_test.expect_packet(conn, "publish 5", publish_5_packet): - conn.send(pubrec_5_packet) - if mosq_test.expect_packet(conn, "pubrel 5", pubrel_5_packet): - conn.send(pubcomp_5_packet) - rc = 0 + mosq_test.do_receive_send(conn, publish_5_packet, pubrec_5_packet, "publish 5") + mosq_test.do_receive_send(conn, pubrel_5_packet, pubcomp_5_packet, "pubrel 5") + + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: for i in range(0, 5): if client.returncode != None: diff --git a/test/lib/03-publish-c2b-qos2-receive-maximum-2.py b/test/lib/03-publish-c2b-qos2-receive-maximum-2.py index 2859cb53..a38da5b5 100755 --- a/test/lib/03-publish-c2b-qos2-receive-maximum-2.py +++ b/test/lib/03-publish-c2b-qos2-receive-maximum-2.py @@ -69,37 +69,38 @@ try: (conn, address) = sock.accept() conn.settimeout(10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") - if mosq_test.expect_packet(conn, "publish 1", publish_1_packet): - if mosq_test.expect_packet(conn, "publish 2", publish_2_packet): - conn.send(pubrec_1_packet) - conn.send(pubrec_2_packet) + mosq_test.expect_packet(conn, "publish 1", publish_1_packet) + mosq_test.expect_packet(conn, "publish 2", publish_2_packet) + conn.send(pubrec_1_packet) + conn.send(pubrec_2_packet) - if mosq_test.expect_packet(conn, "pubrel 1", pubrel_1_packet): - if mosq_test.expect_packet(conn, "pubrel 2", pubrel_2_packet): - conn.send(pubcomp_1_packet) - conn.send(pubcomp_2_packet) + mosq_test.expect_packet(conn, "pubrel 1", pubrel_1_packet) + mosq_test.expect_packet(conn, "pubrel 2", pubrel_2_packet) + conn.send(pubcomp_1_packet) + conn.send(pubcomp_2_packet) - if mosq_test.expect_packet(conn, "publish 3", publish_3_packet): - if mosq_test.expect_packet(conn, "publish 4", publish_4_packet): - conn.send(pubrec_3_packet) - conn.send(pubrec_4_packet) + mosq_test.expect_packet(conn, "publish 3", publish_3_packet) + mosq_test.expect_packet(conn, "publish 4", publish_4_packet) + conn.send(pubrec_3_packet) + conn.send(pubrec_4_packet) - if mosq_test.expect_packet(conn, "pubrel 3", pubrel_3_packet): - if mosq_test.expect_packet(conn, "pubrel 4", pubrel_4_packet): - conn.send(pubcomp_3_packet) - conn.send(pubcomp_4_packet) + mosq_test.expect_packet(conn, "pubrel 3", pubrel_3_packet) + mosq_test.expect_packet(conn, "pubrel 4", pubrel_4_packet) + conn.send(pubcomp_3_packet) + conn.send(pubcomp_4_packet) - if mosq_test.expect_packet(conn, "publish 5", publish_5_packet): - conn.send(pubrec_5_packet) + mosq_test.expect_packet(conn, "publish 5", publish_5_packet) + conn.send(pubrec_5_packet) - if mosq_test.expect_packet(conn, "pubrel 5", pubrel_5_packet): - conn.send(pubcomp_5_packet) - rc = 0 + mosq_test.expect_packet(conn, "pubrel 5", pubrel_5_packet) + conn.send(pubcomp_5_packet) + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: for i in range(0, 5): if client.returncode != None: diff --git a/test/lib/03-publish-c2b-qos2-timeout.py b/test/lib/03-publish-c2b-qos2-timeout.py index 8cd785fd..939c1018 100755 --- a/test/lib/03-publish-c2b-qos2-timeout.py +++ b/test/lib/03-publish-c2b-qos2-timeout.py @@ -58,23 +58,24 @@ try: (conn, address) = sock.accept() conn.settimeout(10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") - if mosq_test.expect_packet(conn, "publish", publish_packet): - # Delay for > 3 seconds (message retry time) + mosq_test.expect_packet(conn, "publish", publish_packet) + # Delay for > 3 seconds (message retry time) - if mosq_test.expect_packet(conn, "dup publish", publish_dup_packet): - conn.send(pubrec_packet) + mosq_test.expect_packet(conn, "dup publish", publish_dup_packet) + conn.send(pubrec_packet) - if mosq_test.expect_packet(conn, "pubrel", pubrel_packet): - if mosq_test.expect_packet(conn, "dup pubrel", pubrel_packet): - conn.send(pubcomp_packet) + mosq_test.expect_packet(conn, "pubrel", pubrel_packet) + mosq_test.expect_packet(conn, "dup pubrel", pubrel_packet) + conn.send(pubcomp_packet) - if mosq_test.expect_packet(conn, "disconnect", disconnect_packet): - rc = 0 + mosq_test.expect_packet(conn, "disconnect", disconnect_packet) + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: client.terminate() client.wait() diff --git a/test/lib/03-publish-c2b-qos2.py b/test/lib/03-publish-c2b-qos2.py index 24cdc66c..4c846963 100755 --- a/test/lib/03-publish-c2b-qos2.py +++ b/test/lib/03-publish-c2b-qos2.py @@ -58,19 +58,15 @@ try: (conn, address) = sock.accept() conn.settimeout(10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) - - if mosq_test.expect_packet(conn, "publish", publish_packet): - conn.send(pubrec_packet) - - if mosq_test.expect_packet(conn, "pubrel", pubrel_packet): - conn.send(pubcomp_packet) - - if mosq_test.expect_packet(conn, "disconnect", disconnect_packet): - rc = 0 + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") + mosq_test.do_receive_send(conn, publish_packet, pubrec_packet, "publish") + mosq_test.do_receive_send(conn, pubrel_packet, pubcomp_packet, "pubrel") + mosq_test.expect_packet(conn, "disconnect", disconnect_packet) + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: client.terminate() client.wait() diff --git a/test/lib/03-publish-qos0-no-payload.py b/test/lib/03-publish-qos0-no-payload.py index 437ec906..9b8b2ea7 100755 --- a/test/lib/03-publish-qos0-no-payload.py +++ b/test/lib/03-publish-qos0-no-payload.py @@ -43,14 +43,15 @@ try: (conn, address) = sock.accept() conn.settimeout(10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") - if mosq_test.expect_packet(conn, "publish", publish_packet): - if mosq_test.expect_packet(conn, "disconnect", disconnect_packet): - rc = 0 + mosq_test.expect_packet(conn, "publish", publish_packet) + mosq_test.expect_packet(conn, "disconnect", disconnect_packet) + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: client.terminate() client.wait() diff --git a/test/lib/03-publish-qos0.py b/test/lib/03-publish-qos0.py index 9af5b867..713cddfa 100755 --- a/test/lib/03-publish-qos0.py +++ b/test/lib/03-publish-qos0.py @@ -43,14 +43,15 @@ try: (conn, address) = sock.accept() conn.settimeout(10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") - if mosq_test.expect_packet(conn, "publish", publish_packet): - if mosq_test.expect_packet(conn, "disconnect", disconnect_packet): - rc = 0 + mosq_test.expect_packet(conn, "publish", publish_packet) + mosq_test.expect_packet(conn, "disconnect", disconnect_packet) + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: client.terminate() client.wait() diff --git a/test/lib/03-request-response-correlation.py b/test/lib/03-request-response-correlation.py index 01a297f4..d3441ca0 100755 --- a/test/lib/03-request-response-correlation.py +++ b/test/lib/03-request-response-correlation.py @@ -56,26 +56,22 @@ try: (conn2, address) = sock.accept() conn2.settimeout(10) - if mosq_test.expect_packet(conn1, "connect1", connect1_packet): - conn1.send(connack_packet) + mosq_test.do_receive_send(conn1, connect1_packet, connack_packet, "connect1") + mosq_test.do_receive_send(conn2, connect2_packet, connack_packet, "connect2") - if mosq_test.expect_packet(conn2, "connect2", connect2_packet): - conn2.send(connack_packet) + mosq_test.do_receive_send(conn1, subscribe1_packet, suback_packet, "subscribe1") + mosq_test.do_receive_send(conn2, subscribe2_packet, suback_packet, "subscribe2") - if mosq_test.expect_packet(conn1, "subscribe1", subscribe1_packet): - conn1.send(suback_packet) + mosq_test.expect_packet(conn1, "publish1", publish1_packet_incoming) + conn2.send(publish1_packet_outgoing) - if mosq_test.expect_packet(conn2, "subscribe2", subscribe2_packet): - conn2.send(suback_packet) - - if mosq_test.expect_packet(conn1, "publish1", publish1_packet_incoming): - conn2.send(publish1_packet_outgoing) - - if mosq_test.expect_packet(conn2, "publish2", publish2_packet): - rc = 0 + mosq_test.expect_packet(conn2, "publish2", publish2_packet) + rc = 0 conn1.close() conn2.close() +except mosq_test.TestError: + pass finally: client1.terminate() client1.wait() diff --git a/test/lib/03-request-response.py b/test/lib/03-request-response.py index 00c7d763..b7fbe3d5 100755 --- a/test/lib/03-request-response.py +++ b/test/lib/03-request-response.py @@ -49,26 +49,22 @@ try: (conn2, address) = sock.accept() conn2.settimeout(10) - if mosq_test.expect_packet(conn1, "connect1", connect1_packet): - conn1.send(connack_packet) + mosq_test.do_receive_send(conn1, connect1_packet, connack_packet, "connect1") + mosq_test.do_receive_send(conn2, connect2_packet, connack_packet, "connect2") - if mosq_test.expect_packet(conn2, "connect2", connect2_packet): - conn2.send(connack_packet) + mosq_test.do_receive_send(conn1, subscribe1_packet, suback_packet, "subscribe1") + mosq_test.do_receive_send(conn2, subscribe2_packet, suback_packet, "subscribe2") - if mosq_test.expect_packet(conn1, "subscribe1", subscribe1_packet): - conn1.send(suback_packet) + mosq_test.expect_packet(conn1, "publish1", publish1_packet) + conn2.send(publish1_packet) - if mosq_test.expect_packet(conn2, "subscribe2", subscribe2_packet): - conn2.send(suback_packet) - - if mosq_test.expect_packet(conn1, "publish1", publish1_packet): - conn2.send(publish1_packet) - - if mosq_test.expect_packet(conn2, "publish2", publish2_packet): - rc = 0 + mosq_test.expect_packet(conn2, "publish2", publish2_packet) + rc = 0 conn1.close() conn2.close() +except mosq_test.TestError: + pass finally: client1.terminate() client1.wait() diff --git a/test/lib/04-retain-qos0.py b/test/lib/04-retain-qos0.py index 117a2f50..d46731f3 100755 --- a/test/lib/04-retain-qos0.py +++ b/test/lib/04-retain-qos0.py @@ -34,13 +34,14 @@ try: (conn, address) = sock.accept() conn.settimeout(10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") - if mosq_test.expect_packet(conn, "publish", publish_packet): - rc = 0 + mosq_test.expect_packet(conn, "publish", publish_packet) + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: client.terminate() client.wait() diff --git a/test/lib/08-ssl-connect-cert-auth-enc.py b/test/lib/08-ssl-connect-cert-auth-enc.py index ef84dea2..fad6b8b5 100755 --- a/test/lib/08-ssl-connect-cert-auth-enc.py +++ b/test/lib/08-ssl-connect-cert-auth-enc.py @@ -47,13 +47,13 @@ try: (conn, address) = ssock.accept() conn.settimeout(10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) - - if mosq_test.expect_packet(conn, "disconnect", disconnect_packet): - rc = 0 + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") + mosq_test.expect_packet(conn, "disconnect", disconnect_packet) + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: client.terminate() client.wait() diff --git a/test/lib/08-ssl-connect-cert-auth.py b/test/lib/08-ssl-connect-cert-auth.py index 4e1dfd6b..dba818c1 100755 --- a/test/lib/08-ssl-connect-cert-auth.py +++ b/test/lib/08-ssl-connect-cert-auth.py @@ -47,13 +47,13 @@ try: (conn, address) = ssock.accept() conn.settimeout(10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) - - if mosq_test.expect_packet(conn, "disconnect", disconnect_packet): - rc = 0 + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") + mosq_test.expect_packet(conn, "disconnect", disconnect_packet) + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: client.terminate() client.wait() diff --git a/test/lib/08-ssl-connect-no-auth.py b/test/lib/08-ssl-connect-no-auth.py index dd3215b1..d994a5b4 100755 --- a/test/lib/08-ssl-connect-no-auth.py +++ b/test/lib/08-ssl-connect-no-auth.py @@ -44,13 +44,14 @@ try: (conn, address) = ssock.accept() conn.settimeout(100) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") - if mosq_test.expect_packet(conn, "disconnect", disconnect_packet): - rc = 0 + mosq_test.expect_packet(conn, "disconnect", disconnect_packet) + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: client.terminate() client.wait() diff --git a/test/lib/08-ssl-fake-cacert.py b/test/lib/08-ssl-fake-cacert.py index cb61b63e..a1306677 100755 --- a/test/lib/08-ssl-fake-cacert.py +++ b/test/lib/08-ssl-fake-cacert.py @@ -34,6 +34,8 @@ try: except ssl.SSLError: # Expected error due to ca certs not matching. pass +except mosq_test.TestError: + pass finally: time.sleep(1.0) try: diff --git a/test/lib/11-prop-oversize-packet.py b/test/lib/11-prop-oversize-packet.py index 8151ff37..5f09437f 100755 --- a/test/lib/11-prop-oversize-packet.py +++ b/test/lib/11-prop-oversize-packet.py @@ -40,14 +40,15 @@ try: (conn, address) = sock.accept() conn.settimeout(10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") - if mosq_test.expect_packet(conn, "publish", publish_packet): - if mosq_test.expect_packet(conn, "disconnect", disconnect_packet): - rc = 0 + mosq_test.expect_packet(conn, "publish", publish_packet) + mosq_test.expect_packet(conn, "disconnect", disconnect_packet) + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: client.terminate() client.wait() diff --git a/test/lib/11-prop-recv-qos0.py b/test/lib/11-prop-recv-qos0.py index f3e22843..f1515974 100755 --- a/test/lib/11-prop-recv-qos0.py +++ b/test/lib/11-prop-recv-qos0.py @@ -39,14 +39,13 @@ try: (conn, address) = sock.accept() conn.settimeout(10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) - - conn.send(publish_packet) - if mosq_test.expect_packet(conn, "ok", ok_packet): - rc = 0 + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") + mosq_test.do_send_receive(conn, publish_packet, ok_packet, "ok") + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: client.terminate() client.wait() diff --git a/test/lib/11-prop-recv-qos1.py b/test/lib/11-prop-recv-qos1.py index 194a561c..aead3715 100755 --- a/test/lib/11-prop-recv-qos1.py +++ b/test/lib/11-prop-recv-qos1.py @@ -42,15 +42,16 @@ try: (conn, address) = sock.accept() conn.settimeout(10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") - conn.send(publish_packet) - if mosq_test.expect_packet(conn, "puback", puback_packet): - if mosq_test.expect_packet(conn, "ok", ok_packet): - rc = 0 + conn.send(publish_packet) + mosq_test.expect_packet(conn, "puback", puback_packet) + mosq_test.expect_packet(conn, "ok", ok_packet) + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: client.terminate() client.wait() diff --git a/test/lib/11-prop-recv-qos2.py b/test/lib/11-prop-recv-qos2.py index 705bf0a9..8a9f8ba5 100755 --- a/test/lib/11-prop-recv-qos2.py +++ b/test/lib/11-prop-recv-qos2.py @@ -44,17 +44,15 @@ try: (conn, address) = sock.accept() conn.settimeout(10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) - - conn.send(publish_packet) - if mosq_test.expect_packet(conn, "pubrec", pubrec_packet): - conn.send(pubrel_packet) - if mosq_test.expect_packet(conn, "pubcomp", pubcomp_packet): - if mosq_test.expect_packet(conn, "ok", ok_packet): - rc = 0 + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") + mosq_test.do_send_receive(conn, publish_packet, pubrec_packet, "pubrec") + mosq_test.do_send_receive(conn, pubrel_packet, pubcomp_packet, "pubcomp") + mosq_test.expect_packet(conn, "ok", ok_packet) + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: client.terminate() client.wait() diff --git a/test/lib/11-prop-send-content-type.py b/test/lib/11-prop-send-content-type.py index dddbfe31..58613c93 100755 --- a/test/lib/11-prop-send-content-type.py +++ b/test/lib/11-prop-send-content-type.py @@ -34,14 +34,15 @@ try: (conn, address) = sock.accept() conn.settimeout(10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") - if mosq_test.expect_packet(conn, "publish", publish_packet): - if mosq_test.expect_packet(conn, "disconnect", disconnect_packet): - rc = 0 + mosq_test.expect_packet(conn, "publish", publish_packet) + mosq_test.expect_packet(conn, "disconnect", disconnect_packet) + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: client.terminate() client.wait() diff --git a/test/lib/11-prop-send-payload-format.py b/test/lib/11-prop-send-payload-format.py index 6a826370..6e042971 100755 --- a/test/lib/11-prop-send-payload-format.py +++ b/test/lib/11-prop-send-payload-format.py @@ -44,14 +44,15 @@ try: (conn, address) = sock.accept() conn.settimeout(10) - if mosq_test.expect_packet(conn, "connect", connect_packet): - conn.send(connack_packet) + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") - if mosq_test.expect_packet(conn, "publish", publish_packet): - if mosq_test.expect_packet(conn, "disconnect", disconnect_packet): - rc = 0 + mosq_test.expect_packet(conn, "publish", publish_packet) + mosq_test.expect_packet(conn, "disconnect", disconnect_packet) + rc = 0 conn.close() +except mosq_test.TestError: + pass finally: client.terminate() client.wait()