Mirrors_Framework/mosquitto
1
0
Fork 0
mirror of https://github.com/eclipse-mosquitto/mosquitto.git synced 2026-02-05 18:50:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix use of "dup" with pubrel, subscribe, unsubscribe.

Browse Source 
Thanks to Paolo Patierno.
This commit is contained in:
Roger A. Light
2014-11-19 21:28:52 +00:00
parent 2ce4d94282
commit 5b6f6976c7
13 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/broker/03-publish-b2c-disconnect-qos2.py
View File

@@ -27,7 +27,6 @@ publish_packet = mosq_test.gen_publish("qos2/disconnect/test", qos=2, mid=mid, p
publish_dup_packet = mosq_test.gen_publish("qos2/disconnect/test", qos=2, mid=mid, payload="disconnect-message", dup=True)
pubrec_packet = mosq_test.gen_pubrec(mid)
pubrel_packet = mosq_test.gen_pubrel(mid)
pubrel_dup_packet = mosq_test.gen_pubrel(mid, dup=True)
pubcomp_packet = mosq_test.gen_pubcomp(mid)
mid = 3266
@@ -61,7 +60,7 @@ try:
sock.close()
sock = mosq_test.do_client_connect(connect_packet, connack_packet)
if mosq_test.expect_packet(sock, "dup pubrel", pubrel_dup_packet):
if mosq_test.expect_packet(sock, "dup pubrel", pubrel_packet):
sock.send(pubcomp_packet)
rc = 0
sock.close()

3
test/broker/03-publish-b2c-timeout-qos2.py
View File

@@ -29,7 +29,6 @@ publish_packet = mosq_test.gen_publish("qos2/timeout/test", qos=2, mid=mid, payl
publish_dup_packet = mosq_test.gen_publish("qos2/timeout/test", qos=2, mid=mid, payload="timeout-message", dup=True)
pubrec_packet = mosq_test.gen_pubrec(mid)
pubrel_packet = mosq_test.gen_pubrel(mid)
pubrel_dup_packet = mosq_test.gen_pubrel(mid, dup=True)
pubcomp_packet = mosq_test.gen_pubcomp(mid)
broker = mosq_test.start_broker(filename=os.path.basename(__file__))
@@ -54,7 +53,7 @@ try:
# 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_dup_packet):
if mosq_test.expect_packet(sock, "dup pubrel", pubrel_packet):
sock.send(pubcomp_packet)
rc = 0

3
test/broker/06-bridge-br2b-disconnect-qos2.py
View File

@@ -38,7 +38,6 @@ publish_packet = mosq_test.gen_publish("bridge/disconnect/test", qos=2, mid=mid,
publish_dup_packet = mosq_test.gen_publish("bridge/disconnect/test", qos=2, mid=mid, payload="disconnect-message", dup=True)
pubrec_packet = mosq_test.gen_pubrec(mid)
pubrel_packet = mosq_test.gen_pubrel(mid)
pubrel_dup_packet = mosq_test.gen_pubrel(mid, True)
pubcomp_packet = mosq_test.gen_pubcomp(mid)
ssock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -90,7 +89,7 @@ try:
if mosq_test.expect_packet(bridge, "3rd subscribe", subscribe3_packet):
bridge.send(suback3_packet)
if mosq_test.expect_packet(bridge, "2nd pubrel", pubrel_dup_packet):
if mosq_test.expect_packet(bridge, "2nd pubrel", pubrel_packet):
bridge.send(pubcomp_packet)
rc = 0

3
test/lib/03-publish-c2b-qos2-disconnect.py
View File

@@ -28,7 +28,6 @@ publish_packet = mosq_test.gen_publish("pub/qos2/test", qos=2, mid=mid, payload=
publish_dup_packet = mosq_test.gen_publish("pub/qos2/test", qos=2, mid=mid, payload="message", dup=True)
pubrec_packet = mosq_test.gen_pubrec(mid)
pubrel_packet = mosq_test.gen_pubrel(mid)
pubrel_dup_packet = mosq_test.gen_pubrel(mid, dup=True)
pubcomp_packet = mosq_test.gen_pubcomp(mid)
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -78,7 +77,7 @@ try:
if mosq_test.expect_packet(conn, "connect", connect_packet):
conn.send(connack_packet)
if mosq_test.expect_packet(conn, "retried pubrel", pubrel_dup_packet):
if mosq_test.expect_packet(conn, "retried pubrel", pubrel_packet):
conn.send(pubcomp_packet)
if mosq_test.expect_packet(conn, "disconnect", disconnect_packet):

3
test/lib/03-publish-c2b-qos2-timeout.py
View File

@@ -46,7 +46,6 @@ publish_packet = mosq_test.gen_publish("pub/qos2/test", qos=2, mid=mid, payload=
publish_dup_packet = mosq_test.gen_publish("pub/qos2/test", qos=2, mid=mid, payload="message", dup=True)
pubrec_packet = mosq_test.gen_pubrec(mid)
pubrel_packet = mosq_test.gen_pubrel(mid)
pubrel_dup_packet = mosq_test.gen_pubrel(mid, dup=True)
pubcomp_packet = mosq_test.gen_pubcomp(mid)
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -79,7 +78,7 @@ try:
conn.send(pubrec_packet)
if mosq_test.expect_packet(conn, "pubrel", pubrel_packet):
if mosq_test.expect_packet(conn, "dup pubrel", pubrel_dup_packet):
if mosq_test.expect_packet(conn, "dup pubrel", pubrel_packet):
conn.send(pubcomp_packet)
if mosq_test.expect_packet(conn, "disconnect", disconnect_packet):