Fixing QoS 2 tests.

test/lib/11-prop-recv-qos2.py

@@ -21,9 +21,9 @@ def do_test(conn, data):
  disconnect_packet = mosq_test.gen_disconnect(proto_ver=5)
 
  mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect")
- mosq_test.do_send_receive(conn, publish_packet, pubrec_packet, "pubrec")
- mosq_test.do_send_receive(conn, pubrel_packet, pubcomp_packet, "pubcomp")
- mosq_test.expect_packet(conn, "ok", ok_packet)
+ mosq_test.do_send_receive(conn, publish_packet, ok_packet, "ok")
+ mosq_test.do_receive_send(conn, pubrec_packet, pubrel_packet, "pubrel")
+ mosq_test.expect_packet(conn, "pubcomp", pubcomp_packet)
 
  conn.close()
 

test/lib/c/03-publish-b2c-qos2-len.c

@@ -18,6 +18,7 @@ static void on_connect(struct mosquitto *mosq, void *obj, int rc)
 
 static void on_message(struct mosquitto *mosq, void *obj, const struct mosquitto_message *msg)
 {
+ (void)mosq;
  (void)obj;
 
  if(msg->mid != 56){
@@ -45,7 +46,7 @@ static void on_message(struct mosquitto *mosq, void *obj, const struct mosquitto
  exit(1);
  }
 
- mosquitto_disconnect(mosq);
+ run = 0;
 }
 
 static void on_disconnect(struct mosquitto *mosq, void *obj, int rc)
@@ -54,7 +55,7 @@ static void on_disconnect(struct mosquitto *mosq, void *obj, int rc)
  (void)obj;
  (void)rc;
 
- run = 0;
+ run = rc;
 }
 
 int main(int argc, char *argv[])
@@ -86,6 +87,17 @@ int main(int argc, char *argv[])
  mosquitto_loop(mosq, 100, 1);
  }
 
+ // Drain the PUBREL and PUBCOMP messages.
+ for(int i = 0; i < 2; i++){
+ mosquitto_loop(mosq, 300, 1);
+ }
+
+ run = -1;
+ mosquitto_disconnect(mosq);
+ while(run == -1){
+ mosquitto_loop(mosq, 100, 1);
+ }
+
  mosquitto_destroy(mosq);
  mosquitto_lib_cleanup();
  return run;

test/lib/c/03-publish-b2c-qos2.c

@@ -76,8 +76,10 @@ int main(int argc, char *argv[])
  mosquitto_loop(mosq, 300, 1);
  }
 
- // TODO: Drain the PUBREL and PUBCOMP messages.
- mosquitto_loop(mosq, 300, 1);
+ // Drain the PUBREL and PUBCOMP messages.
+ for(int i = 0; i < 2; i++){
+ mosquitto_loop(mosq, 300, 1);
+ }
 
  mosquitto_destroy(mosq);
  mosquitto_lib_cleanup();

test/lib/c/11-prop-recv.c

@@ -81,6 +81,14 @@ int main(int argc, char *argv[])
  rc = mosquitto_loop(mosq, -1, 1);
  if(rc != MOSQ_ERR_SUCCESS) return rc;
  }
+
+ if (qos > 1){
+ // Drain the PUBREL and PUBCOMP messages.
+ for(int i = 0; i < 2; i++){
+ mosquitto_loop(mosq, 300, 1);
+ }
+ }
+
  mosquitto_destroy(mosq);
 
  mosquitto_lib_cleanup();

test/lib/cpp/03-publish-b2c-qos2-len.cpp

@@ -60,7 +60,7 @@ void mosquittopp_test::on_message(const struct mosquitto_message *msg)
  exit(1);
  }
 
- disconnect();
+ run = 0;
 }
 
 int main(int argc, char *argv[])
@@ -81,6 +81,18 @@ int main(int argc, char *argv[])
  mosq->loop(100, 1);
  }
 
+ // Drain the PUBREL and PUBCOMP messages.
+ for(int i = 0; i < 2; i++){
+ mosq->loop();
+ }
+
+ run = -1;
+ mosq->disconnect();
+ // Wait for disconnect to complete.
+ while(run == -1){
+ mosq->loop(100, 1);
+ }
+
  delete mosq;
  mosqpp::lib_cleanup();
 

test/lib/cpp/03-publish-b2c-qos2.cpp

@@ -75,6 +75,11 @@ int main(int argc, char *argv[])
  mosq->loop();
  }
 
+ // Drain the PUBREL and PUBCOMP messages.
+ for(int i = 0; i < 2; i++){
+ mosq->loop();
+ }
+
  delete mosq;
  mosqpp::lib_cleanup();
 

test/lib/cpp/11-prop-recv.cpp

@@ -76,6 +76,14 @@ int main(int argc, char *argv[])
  rc = mosq->loop();
  if(rc != MOSQ_ERR_SUCCESS) return rc;
  }
+
+ if (qos > 1){
+ // Drain the PUBREL and PUBCOMP messages.
+ for(int i = 0; i < 2; i++){
+ mosq->loop();
+ }
+ }
+
  delete mosq;
 
  mosqpp::lib_cleanup();