diff --git a/test/broker/11-persistent-subscription-v5.py b/test/broker/11-persistent-subscription-v5.py deleted file mode 100755 index 52976697..00000000 --- a/test/broker/11-persistent-subscription-v5.py +++ /dev/null @@ -1,78 +0,0 @@ -#!/usr/bin/env python3 - -# Test whether a client subscribed to a topic receives its own message sent to that topic. - -from mosq_test_helper import * - -def write_config(filename, port): - with open(filename, 'w') as f: - f.write("listener %d\n" % (port)) - f.write("allow_anonymous true\n") - f.write("persistence true\n") - f.write("persistence_file mosquitto-%d.db\n" % (port)) - -port = mosq_test.get_port() -conf_file = os.path.basename(__file__).replace('.py', '.conf') -write_config(conf_file, port) - -rc = 1 -mid = 530 - -connect_packet = mosq_test.gen_connect( - "persistent-subscription-test", clean_session=False, proto_ver=5, session_expiry=60 -) -connack_packet = mosq_test.gen_connack(rc=0, proto_ver=5) -connack_packet2 = mosq_test.gen_connack(rc=0, flags=1, proto_ver=5) # session present - -subscribe_packet = mosq_test.gen_subscribe(mid, "subpub/qos1", 1, proto_ver=5) -suback_packet = mosq_test.gen_suback(mid, 1, proto_ver=5) - -mid = 300 -publish_packet = mosq_test.gen_publish("subpub/qos1", qos=1, mid=mid, payload="message", proto_ver=5) -puback_packet = mosq_test.gen_puback(mid, proto_ver=5) - -mid = 1 -publish_packet2 = mosq_test.gen_publish("subpub/qos1", qos=1, mid=mid, payload="message", proto_ver=5) - -if os.path.exists('mosquitto-%d.db' % (port)): - os.unlink('mosquitto-%d.db' % (port)) - -broker = mosq_test.start_broker(filename=os.path.basename(__file__), use_conf=True, port=port) - -(stdo1, stde1) = ("", "") -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") - - broker.terminate() - if mosq_test.wait_for_subprocess(broker): - print("broker not terminated") - if rc == 0: rc=1 - (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_packet2, timeout=20, port=port) - - sock.send(publish_packet) - mosq_test.receive_unordered(sock, puback_packet, publish_packet2, "puback/publish2") - rc = 0 - - sock.close() -except mosq_test.TestError: - pass -finally: - os.remove(conf_file) - broker.terminate() - if mosq_test.wait_for_subprocess(broker): - print("broker not terminated") - if rc == 0: rc=1 - (stdo, stde) = broker.communicate() - if rc: - print(stde.decode('utf-8')) - if os.path.exists('mosquitto-%d.db' % (port)): - os.unlink('mosquitto-%d.db' % (port)) - - -exit(rc) - diff --git a/test/broker/Makefile b/test/broker/Makefile index 5e77d153..22c9a6cb 100644 --- a/test/broker/Makefile +++ b/test/broker/Makefile @@ -236,7 +236,6 @@ endif ./11-message-expiry.py ./11-persistence-autosave-changes.py ./11-persistent-subscription.py - ./11-persistent-subscription-v5.py ./11-persistent-subscription-no-local.py ./11-pub-props.py ./11-subscription-id.py diff --git a/test/broker/test.py b/test/broker/test.py index 1aa67faf..3925c6b9 100755 --- a/test/broker/test.py +++ b/test/broker/test.py @@ -205,7 +205,6 @@ tests = [ (1, './11-message-expiry.py'), (1, './11-persistence-autosave-changes.py'), (1, './11-persistent-subscription.py'), - (1, './11-persistent-subscription-v5.py'), (1, './11-persistent-subscription-no-local.py'), (1, './11-pub-props.py'), (1, './11-subscription-id.py'),