More test fixes.

test/broker/01-connect-invalid-id-0.py

@@ -16,7 +16,7 @@ import mosq_test
 
 rc = 1
 keepalive = 10
-connect_packet = mosq_test.gen_connect("", keepalive=keepalive)
+connect_packet = mosq_test.gen_connect("", keepalive=keepalive, proto_ver=3)
 connack_packet = mosq_test.gen_connack(rc=2)
 
 cmd = ['../../src/mosquitto', '-p', '1888']

test/broker/03-publish-b2c-disconnect-qos1.py

@@ -17,7 +17,8 @@ rc = 1
 mid = 3265
 keepalive = 60
 connect_packet = mosq_test.gen_connect("pub-qos1-disco-test", keepalive=keepalive, clean_session=False)
-connack_packet = mosq_test.gen_connack(rc=0)
+connack1_packet = mosq_test.gen_connack(resv=0, rc=0)
+connack2_packet = mosq_test.gen_connack(resv=1, rc=0)
 
 subscribe_packet = mosq_test.gen_subscribe(mid, "qos1/disconnect/test", 1)
 suback_packet = mosq_test.gen_suback(mid, 1)
@@ -34,7 +35,7 @@ puback2_packet = mosq_test.gen_puback(mid)
 broker = mosq_test.start_broker(filename=os.path.basename(__file__))
 
 try:
-    sock = mosq_test.do_client_connect(connect_packet, connack_packet)
+    sock = mosq_test.do_client_connect(connect_packet, connack1_packet)
     sock.send(subscribe_packet)
 
     if mosq_test.expect_packet(sock, "suback", suback_packet):
@@ -53,7 +54,7 @@ try:
             sock.connect(("localhost", 1888))
             sock.send(connect_packet)
 
-            if mosq_test.expect_packet(sock, "connack", connack_packet):
+            if mosq_test.expect_packet(sock, "connack", connack2_packet):
 
                 if mosq_test.expect_packet(sock, "dup publish", publish_dup_packet):
                     sock.send(puback_packet)

test/broker/03-publish-b2c-disconnect-qos2.py

@@ -17,7 +17,8 @@ rc = 1
 mid = 3265
 keepalive = 60
 connect_packet = mosq_test.gen_connect("pub-qos2-disco-test", keepalive=keepalive, clean_session=False)
-connack_packet = mosq_test.gen_connack(rc=0)
+connack1_packet = mosq_test.gen_connack(resv=0, rc=0)
+connack2_packet = mosq_test.gen_connack(resv=1, rc=0)
 
 subscribe_packet = mosq_test.gen_subscribe(mid, "qos2/disconnect/test", 2)
 suback_packet = mosq_test.gen_suback(mid, 2)
@@ -36,7 +37,7 @@ puback2_packet = mosq_test.gen_puback(mid)
 broker = mosq_test.start_broker(filename=os.path.basename(__file__))
 
 try:
-    sock = mosq_test.do_client_connect(connect_packet, connack_packet)
+    sock = mosq_test.do_client_connect(connect_packet, connack1_packet)
     sock.send(subscribe_packet)
 
     if mosq_test.expect_packet(sock, "suback", suback_packet):
@@ -52,14 +53,14 @@ try:
             sock.send(publish2_packet)
             sock.close()
 
-            sock = mosq_test.do_client_connect(connect_packet, connack_packet)
+            sock = mosq_test.do_client_connect(connect_packet, connack2_packet)
             if mosq_test.expect_packet(sock, "dup publish", publish_dup_packet):
                 sock.send(pubrec_packet)
 
                 if mosq_test.expect_packet(sock, "pubrel", pubrel_packet):
                     sock.close()
 
-                    sock = mosq_test.do_client_connect(connect_packet, connack_packet)
+                    sock = mosq_test.do_client_connect(connect_packet, connack2_packet)
                     if mosq_test.expect_packet(sock, "dup pubrel", pubrel_packet):
                         sock.send(pubcomp_packet)
                         rc = 0

test/broker/03-publish-c2b-disconnect-qos2.py

@@ -16,8 +16,8 @@ import mosq_test
 rc = 1
 mid = 3265
 keepalive = 60
-connect_packet = mosq_test.gen_connect("pub-qos2-disco-test", keepalive=keepalive, clean_session=False)
-connack_packet = mosq_test.gen_connack(rc=0)
+connect_packet = mosq_test.gen_connect("pub-qos2-disco-test", keepalive=keepalive, clean_session=False, proto_ver=3)
+connack_packet = mosq_test.gen_connack(resv=0, rc=0)
 
 subscribe_packet = mosq_test.gen_subscribe(mid, "qos2/disconnect/test", 2)
 suback_packet = mosq_test.gen_suback(mid, 2)
@@ -30,10 +30,6 @@ 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
-publish2_packet = mosq_test.gen_publish("qos1/outgoing", qos=1, mid=mid, payload="outgoing-message")
-puback2_packet = mosq_test.gen_puback(mid)
-
 broker = mosq_test.start_broker(filename=os.path.basename(__file__))
 
 try:

test/broker/05-clean-session-qos1.py

@@ -18,7 +18,8 @@ rc = 1
 mid = 109
 keepalive = 60
 connect_packet = mosq_test.gen_connect("clean-qos2-test", keepalive=keepalive, clean_session=False)
-connack_packet = mosq_test.gen_connack(rc=0)
+connack1_packet = mosq_test.gen_connack(resv=0, rc=0)
+connack2_packet = mosq_test.gen_connack(resv=1, rc=0)
 
 disconnect_packet = mosq_test.gen_disconnect()
 
@@ -33,7 +34,7 @@ cmd = ['../../src/mosquitto', '-p', '1888']
 broker = mosq_test.start_broker(filename=os.path.basename(__file__), cmd=cmd)
 
 try:
-    sock = mosq_test.do_client_connect(connect_packet, connack_packet)
+    sock = mosq_test.do_client_connect(connect_packet, connack1_packet)
     sock.send(subscribe_packet)
 
     if mosq_test.expect_packet(sock, "suback", suback_packet):
@@ -44,7 +45,7 @@ try:
         pub.wait()
 
         # Now reconnect and expect a publish message.
-        sock = mosq_test.do_client_connect(connect_packet, connack_packet, timeout=30)
+        sock = mosq_test.do_client_connect(connect_packet, connack2_packet, timeout=30)
         if mosq_test.expect_packet(sock, "publish", publish_packet):
             sock.send(puback_packet)
             rc = 0