From 6eefb45b44e3e01502498aeca4fc4e9e5389cd54 Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Thu, 3 Jan 2019 23:32:39 +0000 Subject: [PATCH] Broker tests for Receive Maximum. --- .../02-subpub-qos2-receive-maximum-1.py | 73 +++++++++++++++++++ .../02-subpub-qos2-receive-maximum-2.py | 73 +++++++++++++++++++ .../02-subpub-qos2-receive-maximum-helper.py | 53 ++++++++++++++ test/broker/Makefile | 2 + test/broker/ptest.py | 2 + 5 files changed, 203 insertions(+) create mode 100755 test/broker/02-subpub-qos2-receive-maximum-1.py create mode 100755 test/broker/02-subpub-qos2-receive-maximum-2.py create mode 100755 test/broker/02-subpub-qos2-receive-maximum-helper.py diff --git a/test/broker/02-subpub-qos2-receive-maximum-1.py b/test/broker/02-subpub-qos2-receive-maximum-1.py new file mode 100755 index 0000000000..f517a74525 --- /dev/null +++ b/test/broker/02-subpub-qos2-receive-maximum-1.py @@ -0,0 +1,73 @@ +#!/usr/bin/env python + +# Does the broker respect receive maximum==1? +# MQTT v5 + +from mosq_test_helper import * + +rc = 1 +keepalive = 60 +props = mqtt5_props.gen_uint16_prop(mqtt5_props.PROP_RECEIVE_MAXIMUM, 1) +props = mqtt5_props.prop_finalise(props) +connect_packet = mosq_test.gen_connect("subpub-qos2-test", keepalive=keepalive, proto_ver=5, properties=props) +connack_packet = mosq_test.gen_connack(rc=0, proto_ver=5) + +mid = 1 +subscribe_packet = mosq_test.gen_subscribe(mid, "subpub/qos2", 2, proto_ver=5) +suback_packet = mosq_test.gen_suback(mid, 2, proto_ver=5) + +mid = 1 +publish_packet1 = mosq_test.gen_publish("subpub/qos2", qos=2, mid=mid, payload="message1", proto_ver=5) +pubrec_packet1 = mosq_test.gen_pubrec(mid, proto_ver=5) +pubrel_packet1 = mosq_test.gen_pubrel(mid, proto_ver=5) +pubcomp_packet1 = mosq_test.gen_pubcomp(mid, proto_ver=5) + +mid = 2 +publish_packet2 = mosq_test.gen_publish("subpub/qos2", qos=2, mid=mid, payload="message2", proto_ver=5) +pubrec_packet2 = mosq_test.gen_pubrec(mid, proto_ver=5) +pubrel_packet2 = mosq_test.gen_pubrel(mid, proto_ver=5) +pubcomp_packet2 = mosq_test.gen_pubcomp(mid, proto_ver=5) + +mid = 3 +publish_packet3 = mosq_test.gen_publish("subpub/qos2", qos=2, mid=mid, payload="message3", proto_ver=5) +pubrec_packet3 = mosq_test.gen_pubrec(mid, proto_ver=5) +pubrel_packet3 = mosq_test.gen_pubrel(mid, proto_ver=5) +pubcomp_packet3 = mosq_test.gen_pubcomp(mid, proto_ver=5) + + +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, timeout=20, port=port) + + mosq_test.do_send_receive(sock, subscribe_packet, suback_packet, "suback") + + pub = subprocess.Popen(['./02-subpub-qos2-receive-maximum-helper.py', str(port)], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + 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) + + if 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) + + rc = 0 + + sock.close() +finally: + broker.terminate() + broker.wait() + (stdo, stde) = broker.communicate() + if rc: + print(stde) + +exit(rc) + diff --git a/test/broker/02-subpub-qos2-receive-maximum-2.py b/test/broker/02-subpub-qos2-receive-maximum-2.py new file mode 100755 index 0000000000..4084737db8 --- /dev/null +++ b/test/broker/02-subpub-qos2-receive-maximum-2.py @@ -0,0 +1,73 @@ +#!/usr/bin/env python + +# Does the broker respect receive maximum==2? +# MQTT v5 + +from mosq_test_helper import * + +rc = 1 +keepalive = 60 +props = mqtt5_props.gen_uint16_prop(mqtt5_props.PROP_RECEIVE_MAXIMUM, 2) +props = mqtt5_props.prop_finalise(props) +connect_packet = mosq_test.gen_connect("subpub-qos2-test", keepalive=keepalive, proto_ver=5, properties=props) +connack_packet = mosq_test.gen_connack(rc=0, proto_ver=5) + +mid = 1 +subscribe_packet = mosq_test.gen_subscribe(mid, "subpub/qos2", 2, proto_ver=5) +suback_packet = mosq_test.gen_suback(mid, 2, proto_ver=5) + +mid = 1 +publish_packet1 = mosq_test.gen_publish("subpub/qos2", qos=2, mid=mid, payload="message1", proto_ver=5) +pubrec_packet1 = mosq_test.gen_pubrec(mid, proto_ver=5) +pubrel_packet1 = mosq_test.gen_pubrel(mid, proto_ver=5) +pubcomp_packet1 = mosq_test.gen_pubcomp(mid, proto_ver=5) + +mid = 2 +publish_packet2 = mosq_test.gen_publish("subpub/qos2", qos=2, mid=mid, payload="message2", proto_ver=5) +pubrec_packet2 = mosq_test.gen_pubrec(mid, proto_ver=5) +pubrel_packet2 = mosq_test.gen_pubrel(mid, proto_ver=5) +pubcomp_packet2 = mosq_test.gen_pubcomp(mid, proto_ver=5) + +mid = 3 +publish_packet3 = mosq_test.gen_publish("subpub/qos2", qos=2, mid=mid, payload="message3", proto_ver=5) +pubrec_packet3 = mosq_test.gen_pubrec(mid, proto_ver=5) +pubrel_packet3 = mosq_test.gen_pubrel(mid, proto_ver=5) +pubcomp_packet3 = mosq_test.gen_pubcomp(mid, proto_ver=5) + + +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, timeout=20, port=port) + + mosq_test.do_send_receive(sock, subscribe_packet, suback_packet, "suback") + + pub = subprocess.Popen(['./02-subpub-qos2-receive-maximum-helper.py', str(port)], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + 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) + + 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.do_send_receive(sock, pubrec_packet3, pubrel_packet3, "pubrel3") + sock.send(pubcomp_packet3) + + rc = 0 + + sock.close() +finally: + broker.terminate() + broker.wait() + (stdo, stde) = broker.communicate() + if rc: + print(stde) + +exit(rc) + diff --git a/test/broker/02-subpub-qos2-receive-maximum-helper.py b/test/broker/02-subpub-qos2-receive-maximum-helper.py new file mode 100755 index 0000000000..01eb91a691 --- /dev/null +++ b/test/broker/02-subpub-qos2-receive-maximum-helper.py @@ -0,0 +1,53 @@ +#!/usr/bin/env python + +# Test whether a client subscribed to a topic receives its own message sent to that topic. +# MQTT v5 + +from mosq_test_helper import * + +rc = 1 +keepalive = 60 +connect_packet = mosq_test.gen_connect("subpub-qos2-test-helper", keepalive=keepalive, proto_ver=5) +connack_packet = mosq_test.gen_connack(rc=0, proto_ver=5) + +mid = 1 +publish_packet = mosq_test.gen_publish("subpub/qos2", qos=2, mid=mid, payload="message1", proto_ver=5) +pubrec_packet = mosq_test.gen_pubrec(mid, proto_ver=5) +pubrel_packet = mosq_test.gen_pubrel(mid, proto_ver=5) +pubcomp_packet = mosq_test.gen_pubcomp(mid, proto_ver=5) + +mid = 2 +publish_packet2 = mosq_test.gen_publish("subpub/qos2", qos=2, mid=mid, payload="message2", proto_ver=5) +pubrec_packet2 = mosq_test.gen_pubrec(mid, proto_ver=5) +pubrel_packet2 = mosq_test.gen_pubrel(mid, proto_ver=5) +pubcomp_packet2 = mosq_test.gen_pubcomp(mid, proto_ver=5) + +mid = 3 +publish_packet3 = mosq_test.gen_publish("subpub/qos2", qos=2, mid=mid, payload="message3", proto_ver=5) +pubrec_packet3 = mosq_test.gen_pubrec(mid, proto_ver=5) +pubrel_packet3 = mosq_test.gen_pubrel(mid, proto_ver=5) +pubcomp_packet3 = mosq_test.gen_pubcomp(mid, proto_ver=5) + + +port = mosq_test.get_port() + +try: + sock = mosq_test.do_client_connect(connect_packet, connack_packet, timeout=20, port=port) + + mosq_test.do_send_receive(sock, publish_packet, pubrec_packet, "pubrec") + mosq_test.do_send_receive(sock, pubrel_packet, pubcomp_packet, "pubcomp") + + mosq_test.do_send_receive(sock, publish_packet2, pubrec_packet2, "pubrec2") + mosq_test.do_send_receive(sock, pubrel_packet2, pubcomp_packet2, "pubcomp2") + + mosq_test.do_send_receive(sock, publish_packet3, pubrec_packet3, "pubrec3") + mosq_test.do_send_receive(sock, pubrel_packet3, pubcomp_packet3, "pubcomp3") + rc = 0 + + sock.close() +finally: + if rc: + print(stde) + +exit(rc) + diff --git a/test/broker/Makefile b/test/broker/Makefile index fa77f88e70..8d9043d1a9 100644 --- a/test/broker/Makefile +++ b/test/broker/Makefile @@ -56,6 +56,8 @@ endif ./02-subpub-qos0-retain-as-publish.py ./02-subpub-qos0-send-retain.py ./02-subpub-qos0-subscription-id.py + ./02-subpub-qos2-receive-maximum-1.py + ./02-subpub-qos2-receive-maximum-2.py ./02-unsubscribe-qos0.py ./02-unsubscribe-qos1.py ./02-unsubscribe-qos2.py diff --git a/test/broker/ptest.py b/test/broker/ptest.py index 494eda3911..406dfe67f8 100755 --- a/test/broker/ptest.py +++ b/test/broker/ptest.py @@ -39,6 +39,8 @@ (1, './02-subpub-qos0-retain-as-publish.py'), (1, './02-subpub-qos0-send-retain.py'), (1, './02-subpub-qos0-subscription-id.py'), + (1, './02-subpub-qos2-receive-maximum-1.py'), + (1, './02-subpub-qos2-receive-maximum-2.py'), (1, './02-unsubscribe-qos0.py'), (1, './02-unsubscribe-qos1.py'), (1, './02-unsubscribe-qos2.py'),