From 48f1ca853894705bcd5d1e1d5ffc187784779d33 Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Thu, 10 Oct 2019 12:41:23 +0100 Subject: [PATCH] 05 broker tests with v5 support --- test/broker/05-clean-session-qos1-helper.py | 25 ------ test/broker/05-clean-session-qos1.py | 98 ++++++++++++--------- 2 files changed, 58 insertions(+), 65 deletions(-) delete mode 100755 test/broker/05-clean-session-qos1-helper.py diff --git a/test/broker/05-clean-session-qos1-helper.py b/test/broker/05-clean-session-qos1-helper.py deleted file mode 100755 index 6857aea0..00000000 --- a/test/broker/05-clean-session-qos1-helper.py +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env python3 - -# Test whether a clean session client has a QoS 1 message queued for it. - -from mosq_test_helper import * - -rc = 1 -keepalive = 60 -connect_packet = mosq_test.gen_connect("test-helper", keepalive=keepalive) -connack_packet = mosq_test.gen_connack(rc=0) - -mid = 128 -publish_packet = mosq_test.gen_publish("qos1/clean_session/test", qos=1, mid=mid, payload="clean-session-message") -puback_packet = mosq_test.gen_puback(mid) - -port = mosq_test.get_port() -sock = mosq_test.do_client_connect(connect_packet, connack_packet, port=port) -mosq_test.do_send_receive(sock, publish_packet, puback_packet, "puback") - -rc = 0 - -sock.close() - -exit(rc) - diff --git a/test/broker/05-clean-session-qos1.py b/test/broker/05-clean-session-qos1.py index b7dd9ca2..a7821f01 100755 --- a/test/broker/05-clean-session-qos1.py +++ b/test/broker/05-clean-session-qos1.py @@ -4,49 +4,67 @@ from mosq_test_helper import * -rc = 1 -mid = 109 -keepalive = 60 -connect_packet = mosq_test.gen_connect("clean-qos2-test", keepalive=keepalive, clean_session=False) -connack1_packet = mosq_test.gen_connack(flags=0, rc=0) -connack2_packet = mosq_test.gen_connack(flags=1, rc=0) +def helper(port): + connect_packet = mosq_test.gen_connect("test-helper", keepalive=60) + connack_packet = mosq_test.gen_connack(rc=0) -disconnect_packet = mosq_test.gen_disconnect() + mid = 128 + publish_packet = mosq_test.gen_publish("qos1/clean_session/test", qos=1, mid=mid, payload="clean-session-message") + puback_packet = mosq_test.gen_puback(mid) -subscribe_packet = mosq_test.gen_subscribe(mid, "qos1/clean_session/test", 1) -suback_packet = mosq_test.gen_suback(mid, 1) - -mid = 1 -publish_packet = mosq_test.gen_publish("qos1/clean_session/test", qos=1, mid=mid, payload="clean-session-message") -puback_packet = mosq_test.gen_puback(mid) - -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, connack1_packet, port=port) - mosq_test.do_send_receive(sock, subscribe_packet, suback_packet, "suback") - - sock.send(disconnect_packet) - sock.close() - - pub = subprocess.Popen(['./05-clean-session-qos1-helper.py', str(port)], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - pub.wait() - (stdo, stde) = pub.communicate() - - # 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 + sock = mosq_test.do_client_connect(connect_packet, connack_packet, port=port) + mosq_test.do_send_receive(sock, publish_packet, puback_packet, "puback") sock.close() -finally: - broker.terminate() - broker.wait() - (stdo, stde) = broker.communicate() - if rc: - print(stde.decode('utf-8')) -exit(rc) + +def do_test(proto_ver): + rc = 1 + mid = 109 + keepalive = 60 + connect_packet = mosq_test.gen_connect("clean-qos2-test", keepalive=keepalive, clean_session=False, proto_ver=proto_ver, session_expiry=60) + connack1_packet = mosq_test.gen_connack(flags=0, rc=0, proto_ver=proto_ver) + connack2_packet = mosq_test.gen_connack(flags=1, rc=0, proto_ver=proto_ver) + + disconnect_packet = mosq_test.gen_disconnect(proto_ver=proto_ver) + + subscribe_packet = mosq_test.gen_subscribe(mid, "qos1/clean_session/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/clean_session/test", qos=1, mid=mid, payload="clean-session-message", 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, connack1_packet, port=port) + mosq_test.do_send_receive(sock, subscribe_packet, suback_packet, "suback") + + sock.send(disconnect_packet) + sock.close() + + helper(port) + + # 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 + + sock.close() + 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)