From 7baca428da1822c0ece3ba526ef8065c49c7dfa7 Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Thu, 4 Mar 2021 09:49:29 +0000 Subject: [PATCH] Remove obsolete tests. --- test/broker/03-publish-b2c-timeout-qos1.py | 71 ------------------- test/broker/03-publish-b2c-timeout-qos2.py | 81 ---------------------- test/broker/03-publish-c2b-timeout-qos2.py | 52 -------------- 3 files changed, 204 deletions(-) delete mode 100755 test/broker/03-publish-b2c-timeout-qos1.py delete mode 100755 test/broker/03-publish-b2c-timeout-qos2.py delete mode 100755 test/broker/03-publish-c2b-timeout-qos2.py diff --git a/test/broker/03-publish-b2c-timeout-qos1.py b/test/broker/03-publish-b2c-timeout-qos1.py deleted file mode 100755 index a30d1af8..00000000 --- a/test/broker/03-publish-b2c-timeout-qos1.py +++ /dev/null @@ -1,71 +0,0 @@ -#!/usr/bin/env python3 - -# Test whether a SUBSCRIBE to a topic with QoS 2 results in the correct SUBACK packet. - -from mosq_test_helper import * - - -def helper(port): - connect_packet = mosq_test.gen_connect("test-helper", keepalive=60) - connack_packet = mosq_test.gen_connack(rc=0) - - mid = 128 - publish_packet = mosq_test.gen_publish("qos1/timeout/test", qos=1, mid=mid, payload="timeout-message") - puback_packet = mosq_test.gen_puback(mid) - - sock = mosq_test.do_client_connect(connect_packet, connack_packet, connack_error="helper connack") - mosq_test.do_send_receive(sock, publish_packet, puback_packet, "helper puback") - sock.close() - - -def do_test(proto_ver): - rc = 1 - mid = 3265 - keepalive = 60 - connect_packet = mosq_test.gen_connect("pub-qos1-timeout-test", keepalive=keepalive, proto_ver=proto_ver) - connack_packet = mosq_test.gen_connack(rc=0, proto_ver=proto_ver) - - subscribe_packet = mosq_test.gen_subscribe(mid, "qos1/timeout/test", 1, proto_ver=proto_ver) - suback_packet = mosq_test.gen_suback(mid, 1, proto_ver=proto_ver) - - mid = 1 - publish_packet = mosq_test.gen_publish("qos1/timeout/test", qos=1, mid=mid, payload="timeout-message", proto_ver=proto_ver) - publish_dup_packet = mosq_test.gen_publish("qos1/timeout/test", qos=1, mid=mid, payload="timeout-message", dup=True, proto_ver=proto_ver) - puback_packet = mosq_test.gen_puback(mid, proto_ver=proto_ver) - - port = mosq_test.get_port() - broker = mosq_test.start_broker(filename=os.path.basename(__file__), port=port) - - try: - sock = mosq_test.do_client_connect(connect_packet, connack_packet) - mosq_test.do_send_receive(sock, subscribe_packet, suback_packet, "suback") - - helper(port) - # Should have now received a publish command - - 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, "dup publish", publish_dup_packet) - sock.send(puback_packet) - rc = 0 - - sock.close() - except mosq_test.TestError: - pass - finally: - broker.terminate() - broker.wait() - (stdo, stde) = broker.communicate() - if rc: - print(stde.decode('utf-8')) - print("proto_ver=%d" % (proto_ver)) - exit(rc) - - -do_test(proto_ver=4) -do_test(proto_ver=5) - -exit(0) - diff --git a/test/broker/03-publish-b2c-timeout-qos2.py b/test/broker/03-publish-b2c-timeout-qos2.py deleted file mode 100755 index 6b80bf18..00000000 --- a/test/broker/03-publish-b2c-timeout-qos2.py +++ /dev/null @@ -1,81 +0,0 @@ -#!/usr/bin/env python3 - -# Test whether a SUBSCRIBE to a topic with QoS 2 results in the correct SUBACK packet. - -from mosq_test_helper import * - - -def helper(port): - connect_packet = mosq_test.gen_connect("test-helper", keepalive=60) - connack_packet = mosq_test.gen_connack(rc=0) - - mid = 312 - publish_packet = mosq_test.gen_publish("qos2/timeout/test", qos=2, mid=mid, payload="timeout-message") - pubrec_packet = mosq_test.gen_pubrec(mid) - pubrel_packet = mosq_test.gen_pubrel(mid) - pubcomp_packet = mosq_test.gen_pubcomp(mid) - - sock = mosq_test.do_client_connect(connect_packet, connack_packet, connack_error="helper connack") - mosq_test.do_send_receive(sock, publish_packet, pubrec_packet, "helper pubrec") - mosq_test.do_send_receive(sock, pubrel_packet, pubcomp_packet, "helper pubcomp") - sock.close() - - -def do_test(proto_ver): - rc = 1 - mid = 3265 - keepalive = 60 - connect_packet = mosq_test.gen_connect("pub-qo2-timeout-test", keepalive=keepalive, proto_ver=proto_ver) - connack_packet = mosq_test.gen_connack(rc=0, proto_ver=proto_ver) - - subscribe_packet = mosq_test.gen_subscribe(mid, "qos2/timeout/test", 2, proto_ver=proto_ver) - suback_packet = mosq_test.gen_suback(mid, 2, proto_ver=proto_ver) - - mid = 1 - publish_packet = mosq_test.gen_publish("qos2/timeout/test", qos=2, mid=mid, payload="timeout-message", proto_ver=proto_ver) - publish_dup_packet = mosq_test.gen_publish("qos2/timeout/test", qos=2, mid=mid, payload="timeout-message", dup=True, proto_ver=proto_ver) - pubrec_packet = mosq_test.gen_pubrec(mid, proto_ver=proto_ver) - pubrel_packet = mosq_test.gen_pubrel(mid, proto_ver=proto_ver) - pubcomp_packet = mosq_test.gen_pubcomp(mid, proto_ver=proto_ver) - - port = mosq_test.get_port() - broker = mosq_test.start_broker(filename=os.path.basename(__file__), port=port) - - try: - sock = mosq_test.do_client_connect(connect_packet, connack_packet) - mosq_test.do_send_receive(sock, subscribe_packet, suback_packet, "suback") - - helper(port) - # Should have now received a publish command - - 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, "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 - - 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() - (stdo, stde) = broker.communicate() - if rc: - print(stde.decode('utf-8')) - print("proto_ver=%d" % (proto_ver)) - exit(rc) - - -do_test(proto_ver=4) -do_test(proto_ver=5) -exit(0) - diff --git a/test/broker/03-publish-c2b-timeout-qos2.py b/test/broker/03-publish-c2b-timeout-qos2.py deleted file mode 100755 index 54538fe2..00000000 --- a/test/broker/03-publish-c2b-timeout-qos2.py +++ /dev/null @@ -1,52 +0,0 @@ -#!/usr/bin/env python3 - -# Test whether a PUBLISH to a topic with QoS 2 results in the correct packet -# flow. This test introduces delays into the flow in order to force the broker -# to send duplicate PUBREC and PUBCOMP messages. - -from mosq_test_helper import * - - -def do_test(port): - rc = 1 - keepalive = 600 - connect_packet = mosq_test.gen_connect("pub-qos2-timeout-test", keepalive=keepalive, proto_ver=proto_ver) - connack_packet = mosq_test.gen_connack(rc=0, proto_ver=proto_ver) - - mid = 1926 - publish_packet = mosq_test.gen_publish("pub/qos2/test", qos=2, mid=mid, payload="timeout-message", proto_ver=proto_ver) - pubrec_packet = mosq_test.gen_pubrec(mid, proto_ver=proto_ver) - pubrel_packet = mosq_test.gen_pubrel(mid, proto_ver=proto_ver) - pubcomp_packet = mosq_test.gen_pubcomp(mid, proto_ver=proto_ver) - - port = mosq_test.get_port() - broker = mosq_test.start_broker(filename=os.path.basename(__file__), port=port) - - try: - sock = mosq_test.do_client_connect(connect_packet, connack_packet) - mosq_test.do_send_receive(sock, publish_packet, pubrec_packet, "pubrec") - - # Timeout is 8 seconds which means the broker should repeat the PUBREC. - - mosq_test.expect_packet(sock, "pubrec", pubrec_packet) - mosq_test.do_send_receive(sock, pubrel_packet, pubcomp_packet, "pubcomp") - - rc = 0 - - sock.close() - except mosq_test.TestError: - pass - finally: - broker.terminate() - broker.wait() - (stdo, stde) = broker.communicate() - if rc: - print(stde.decode('utf-8')) - print("proto_ver=%d" % (proto_ver)) - exit(rc) - - -do_test(proto_ver=4) -do_test(proto_ver=5) -exit(0) -