From b16de0f1efc275bd7b21821191503ad4d6c92296 Mon Sep 17 00:00:00 2001
From: Longxiang Lyu <lolv@microsoft.com>
Date: Wed, 3 Jul 2024 08:15:42 +0000
Subject: [PATCH] Fix UT

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>
---
 test/LinkManagerStateMachineActiveActiveTest.cpp | 9 ++++-----
 test/MuxPortTest.cpp                             | 5 +----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/test/LinkManagerStateMachineActiveActiveTest.cpp b/test/LinkManagerStateMachineActiveActiveTest.cpp
index ee96d672..683206d1 100644
--- a/test/LinkManagerStateMachineActiveActiveTest.cpp
+++ b/test/LinkManagerStateMachineActiveActiveTest.cpp
@@ -193,10 +193,8 @@ void LinkManagerStateMachineActiveActiveTest::handleMuxState(std::string state,
 
 void LinkManagerStateMachineActiveActiveTest::handlePeerMuxState(std::string state, uint32_t count)
 {
-    for (uint8_t i = 0; i < mPositiveUpdateCount; i++) {
-        mFakeMuxPort.handlePeerMuxState(state);
-        runIoService(count);
-    }
+    mFakeMuxPort.handlePeerMuxState(state);
+    runIoService(count);
 }
 
 void LinkManagerStateMachineActiveActiveTest::handleProbeMuxState(std::string state, uint32_t count)
@@ -405,6 +403,7 @@ TEST_F(LinkManagerStateMachineActiveActiveTest, MuxActiveLinkProberPeerUnknown)
     VALIDATE_PEER_STATE(PeerWait, Wait);
 
     postPeerLinkProberEvent(link_prober::LinkProberState::PeerActive, 1);
+    runIoService(1);
     handlePeerMuxState("active", 1);
     VALIDATE_PEER_STATE(PeerActive, Active);
 
@@ -413,7 +412,7 @@ TEST_F(LinkManagerStateMachineActiveActiveTest, MuxActiveLinkProberPeerUnknown)
     EXPECT_EQ(mDbInterfacePtr->mSetPeerMuxStateInvokeCount, 1);
     EXPECT_EQ(mDbInterfacePtr->mLastSetPeerMuxState, mux_state::MuxState::Label::Standby);
 
-    handlePeerMuxState("standby", 1);
+    handlePeerMuxState("standby", 2);
     VALIDATE_PEER_STATE(PeerUnknown, Standby);
     EXPECT_EQ(mFakeMuxPort.mFakeLinkProber->mSendPeerProbeCommand, 1);
 }
diff --git a/test/MuxPortTest.cpp b/test/MuxPortTest.cpp
index 3700c874..14aba4c4 100644
--- a/test/MuxPortTest.cpp
+++ b/test/MuxPortTest.cpp
@@ -47,6 +47,7 @@ void MuxPortTest::stopIoServiceThreaded()
 {
     mWork.reset();
     mIoService.stop();
+    mThreadGroup.join_all();
 }
 
 void MuxPortTest::SetUp()
@@ -215,7 +216,6 @@ TEST_F(MuxPortTest, TestPeerLinkStateNotificationHandler)
         mFakeMuxPort.handlePeerLinkState("down");
         called += 2;
 
-        uint32_t check = 0;
         while (fakeLinkManagerStateMachinePtr->mPeerLinkStateNotificationHandlerCalled < called)
         {
             usleep(1000);
@@ -236,7 +236,6 @@ TEST_F(MuxPortTest, TestPeerMuxStateNotificationHandler)
         mFakeMuxPort.handlePeerMuxState("standby");
         called += 2;
 
-        uint32_t check = 0;
         while (fakeLinkManagerStateMachinePtr->mPeerMuxStateNotificationHandlerCalled < called)
         {
             usleep(1000);
@@ -257,7 +256,6 @@ TEST_F(MuxPortTest, TestMuxConfigNotificationHandler)
         mFakeMuxPort.handleMuxConfig("standby");
         called += 2;
 
-        uint32_t check = 0;
         while (fakeLinkManagerStateMachinePtr->mMuxConfigNotificationHandlerCalled < called)
         {
             usleep(1000);
@@ -279,7 +277,6 @@ TEST_F(MuxPortTest, TestDefaultRouteStateNotificationHandler)
         mFakeMuxPort.handleDefaultRouteState("ok");
         called += 2;
 
-        uint32_t check = 0;
         while (fakeLinkManagerStateMachinePtr->mDefaultRouteStateNotificationHandlerCalled < called)
         {
             usleep(1000);