fix test failure due to timeout

diff --git a/tests/AITT_TCP_test.cc b/tests/AITT_TCP_test.cc
index 054e3f5..4442817 100644 (file)
--- a/tests/AITT_TCP_test.cc
+++ b/tests/AITT_TCP_test.cc
@@ -55,8 +55,8 @@ class AITTTCPTest : public testing::Test, public AittTests {
                   static_cast<void *>(this), protocol);
 
             // Wait a few seconds until the AITT client gets a server list (discover devices)
-            DBG("Sleep %d secs", SLEEP_MS);
-            sleep(SLEEP_MS);
+            DBG("Sleep %d ms", SLEEP_MS);
+            usleep(SLEEP_MS * 1000);
 
             aitt.Publish("test/value1", dump_msg, 12, protocol);
             aitt.Publish("test/value2", dump_msg, 1600, protocol);
@@ -94,8 +94,8 @@ TEST_F(AITTTCPTest, TCP_Wildcards1_Anytime)
               static_cast<void *>(this), AITT_TYPE_TCP);
 
         // Wait a few seconds until the AITT client gets a server list (discover devices)
-        DBG("Sleep %d secs", SLEEP_MS);
-        sleep(SLEEP_MS);
+        DBG("Sleep %d ms", SLEEP_MS);
+        usleep(SLEEP_MS * 1000);
 
         aitt.Publish("test/step1/value1", dump_msg, 12, AITT_TYPE_TCP);
         aitt.Publish("test/step2/value1", dump_msg, 1600, AITT_TYPE_TCP);

diff --git a/tests/AITT_test.cc b/tests/AITT_test.cc
index efd4e09..eda737f 100644 (file)
--- a/tests/AITT_test.cc
+++ b/tests/AITT_test.cc
@@ -48,8 +48,8 @@ class AITTTest : public testing::Test, public AittTests {
                   static_cast<void *>(this), protocol);
 
             // Wait a few seconds until the AITT client gets a server list (discover devices)
-            DBG("Sleep %d secs", SLEEP_MS);
-            sleep(SLEEP_MS);
+            DBG("Sleep %d ms", SLEEP_MS);
+            usleep(SLEEP_MS * 1000);
 
             DBG("Publish(%s) : %s(%zu)", testTopic.c_str(), test_msg, strlen(test_msg));
             aitt.Publish(testTopic, test_msg, strlen(test_msg), protocol);
@@ -109,7 +109,7 @@ class AITTTest : public testing::Test, public AittTests {
                 aitt1.Connect();
 
                 // Wait a few seconds to the AITT client gets server list (discover devices)
-                sleep(SLEEP_MS);
+                usleep(SLEEP_MS * 1000);
 
                 for (int i = 0; i < 10; i++) {
                     INFO("size = %zu", sizeof(dump_msg));
@@ -171,7 +171,7 @@ class AITTTest : public testing::Test, public AittTests {
                   static_cast<void *>(this), protocol);
 
             // Wait a few seconds to the AITT client gets server list (discover devices)
-            sleep(SLEEP_MS);
+            usleep(SLEEP_MS * 1000);
 
             // NOTE:
             // Select target peers and send the data through the specified protocol - TCP
@@ -210,7 +210,7 @@ class AITTTest : public testing::Test, public AittTests {
                   static_cast<void *>(this), protocol);
 
             // Wait a few seconds to the AITT client gets server list (discover devices)
-            sleep(SLEEP_MS);
+            usleep(SLEEP_MS * 1000);
 
             // NOTE:
             // Publish a message with the retained flag
@@ -579,8 +579,8 @@ TEST_F(AITTTest, PublishSubscribe_Multiple_Protocols_P_Anytime)
               static_cast<void *>(this), AITT_TYPE_MQTT);
 
         // Wait a few seconds to the AITT client gets server list (discover devices)
-        DBG("Sleep %d secs", SLEEP_MS);
-        sleep(SLEEP_MS);
+        DBG("Sleep %d ms", SLEEP_MS);
+        usleep(SLEEP_MS * 1000);
 
         DBG("Publish message to %s (%s) / %zu", testTopic.c_str(), TEST_MSG, sizeof(TEST_MSG));
         aitt.Publish(testTopic, TEST_MSG, sizeof(TEST_MSG),

diff --git a/tests/AittTests.h b/tests/AittTests.h
index 10b4cf9..0274fb0 100644 (file)
--- a/tests/AittTests.h
+++ b/tests/AittTests.h
@@ -28,7 +28,7 @@
 
 #define TEST_MSG "This is aitt test message"
 #define TEST_MSG2 "This message is going to be delivered through a specified AittProtocol"
-#define SLEEP_MS 1
+#define SLEEP_MS 100
 
 class AittTests {
   public:

diff --git a/tests/RequestResponse_test.cc b/tests/RequestResponse_test.cc
index bbcf983..c20c4a8 100644 (file)
--- a/tests/RequestResponse_test.cc
+++ b/tests/RequestResponse_test.cc
@@ -112,6 +112,7 @@ class AITTRRTest : public testing::Test, public AittTests {
         g_timeout_add(10, AittTests::ReadyCheck, static_cast<AittTests *>(this));
         IterateEventLoop();
 
+        aitt.Disconnect();
         EXPECT_TRUE(sub_ok);
         EXPECT_TRUE(reply_ok[0]);
         EXPECT_TRUE(reply_ok[1]);
@@ -137,6 +138,7 @@ class AITTRRTest : public testing::Test, public AittTests {
 
         AITT aitt(clientId, LOCAL_IP, AittOption(true, false));
         aitt.Connect();
+        usleep(SLEEP_MS * 1000);
 
         using namespace std::placeholders;
         auto replyCB = std::bind(&AITTRRTest::PublishSyncInCallback, GetHandle(), &aitt, &reply1_ok,
@@ -153,6 +155,8 @@ class AITTRRTest : public testing::Test, public AittTests {
         g_timeout_add(10, AittTests::ReadyCheck, static_cast<AittTests *>(this));
         IterateEventLoop();
 
+        aitt.Disconnect();
+        sub_aitt.Disconnect();
         EXPECT_TRUE(sub_ok);
         EXPECT_TRUE(reply1_ok);
         EXPECT_TRUE(reply2_ok);
@@ -383,7 +387,7 @@ TEST_F(AITTRRTest, RequestResponse_timeout_restart_P_Anytime)
                       reply_ok = true;
                   invalid++;
               },
-              nullptr, correlation, 500);
+              nullptr, correlation, 100);
 
         EXPECT_TRUE(sub_ok == reply_ok);
         EXPECT_EQ(ret, AITT_ERROR_TIMED_OUT);