From 54a764f1a720d3cc8ee8a957a04b08337da65644 Mon Sep 17 00:00:00 2001
From: Ian Craggs <icraggs@gmail.com>
Date: Wed, 30 Sep 2020 16:20:40 +0100
Subject: [PATCH] Some persistence test updates

---
 test/test_persistence.c | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/test/test_persistence.c b/test/test_persistence.c
index 89cde020..c3113525 100644
--- a/test/test_persistence.c
+++ b/test/test_persistence.c
@@ -491,14 +491,31 @@ int test7(struct Options options)
 	  rc = MQTTAsync_sendMessage(c, test_topic, &pubmsg, &pubopts);
 	  assert("Good rc from sendMessage", rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
 	  if (rc != MQTTASYNC_SUCCESS)
-		  break;
+	  {
+		MySleep(3000);
+		MyLog(LOGA_DEBUG, "Connecting client c");
+		rc = MQTTAsync_connect(c, &opts);
+		assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+		if (rc != MQTTASYNC_SUCCESS)
+		{
+			failures++;
+			goto exit;
+		}
+
+		count = 0;
+		while (!test7c_connected && ++count < 10000)
+			MySleep(100);
+		assert("Count should be less than 10000", count < 10000, "count was %d", count); /* wrong */
+		MySleep(3000);
+		break;
+	  }
 	}
 
 exit:
-	/*rc = MQTTAsync_disconnect(c, NULL);
+	rc = MQTTAsync_disconnect(c, NULL);
  	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
 
-	rc = MQTTAsync_disconnect(d, NULL);
+	/*rc = MQTTAsync_disconnect(d, NULL);
  	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);*/
 
 	MySleep(200);