Some corrections to interops test

test/sync_client_test.c

@@ -408,18 +408,17 @@ int basic_test()
 	rc = MQTTClient_publish(aclient, topics[0], 5, "qos 2", 2, 0, NULL);
 	assert("Good rc from publish", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
 
-	rc = MQTTClient_disconnect(aclient, 100);
+	msleep(1000);
+
+	rc = MQTTClient_disconnect(aclient, 10000);
 	assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
 
 	assert("3 Messages received", messageCount == 3, "messageCount was %d", messageCount);
 	clearMessages();
 
-	rc = MQTTClient_connect(aclient, &opts);
-	assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
-
-	opts.MQTTVersion = MQTTVERSION_3_1;
+	/*opts.MQTTVersion = MQTTVERSION_3_1;
 	rc = MQTTClient_connect(aclient, &opts); // should fail - wrong protocol version
-	assert("Bad rc from connect", rc == MQTTCLIENT_FAILURE, "rc was %d", rc);
+	assert("Bad rc from connect", rc == MQTTCLIENT_FAILURE, "rc was %d", rc);*/
 	
 	MQTTClient_destroy(&aclient);
 
@@ -477,6 +476,8 @@ int offline_message_queueing_test()
 	rc = MQTTClient_publish(bclient, topics[3], 5, "qos 2", 2, 0, NULL);
 	assert("Good rc from publish", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
 
+	msleep(2000);
+
 	rc = MQTTClient_disconnect(bclient, 100);
 	assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
 
@@ -486,7 +487,7 @@ int offline_message_queueing_test()
 	rc = MQTTClient_connect(aclient, &opts);
 	assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
 
-    msleep(200);  // receive the queued messages
+    msleep(1000);  // receive the queued messages
 
 	rc = MQTTClient_disconnect(aclient, 100);
 	assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
@@ -541,12 +542,12 @@ int retained_message_test()
 	rc = MQTTClient_publish(aclient, topics[3], 5, "qos 2", 2, 1, NULL);
 	assert("Good rc from publish", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
 
-    msleep(200);
+    msleep(1000);
 
 	rc = MQTTClient_subscribe(aclient, wildtopics[5], 2);
 	assert("Good rc from subscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
 
-    msleep(200);
+    msleep(2000);
 
 	rc = MQTTClient_disconnect(aclient, 100);
 	assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
@@ -820,7 +821,6 @@ int keepalive_test()
 	tests = failures = 0;
 	clearMessages();
 
-	opts.keepAliveInterval = 5;
 	opts.cleansession = 1;
 	opts.username = options.username;
 	opts.password = options.password;
@@ -832,12 +832,7 @@ int keepalive_test()
 	opts.will->retained = 0;
 	opts.will->topicName = topics[4];
 
-	rc = MQTTClient_create(&aclient, options.connection, options.clientid1, MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
-	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
-
-	rc = MQTTClient_connect(aclient, &opts);
-	assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
-
+	opts.keepAliveInterval = 20;
 	rc = MQTTClient_create(&bclient, options.connection, options.clientid2, MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
 	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
 
@@ -850,7 +845,14 @@ int keepalive_test()
 	rc = MQTTClient_subscribe(bclient, topics[4], 2);
 	assert("Good rc from subscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
 
-	while (messageCount == 0 && ++count < 15)
+	opts.keepAliveInterval = 2;
+	rc = MQTTClient_create(&aclient, options.connection, options.clientid1, MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+
+	rc = MQTTClient_connect(aclient, &opts);
+	assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	while (messageCount == 0 && ++count < 20)
     	msleep(1000);
 
 	rc = MQTTClient_disconnect(bclient, 100);