Fix shutdown ordering in IM integration test (#7469)

project-chip · Aug 20, 2021 · 2313416 · 2313416
1 parent d1929a7
commit 2313416
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/src/app/tests/integration/chip_im_initiator.cpp b/src/app/tests/integration/chip_im_initiator.cpp
@@ -33,7 +33,6 @@
 #include <core/CHIPCore.h>
 #include <mutex>
 #include <platform/CHIPDeviceLayer.h>
-#include <protocols/secure_channel/MessageCounterManager.h>
 #include <protocols/secure_channel/PASESession.h>
 #include <support/ErrorStr.h>
 #include <system/SystemPacketBuffer.h>
@@ -55,9 +54,6 @@ constexpr chip::Transport::AdminId gAdminId       = 0;
 chip::app::ReadClient * gpReadClient = nullptr;
 
 chip::TransportMgr<chip::Transport::UDP> gTransportManager;
-chip::SecureSessionMgr gSessionManager;
-chip::secure_channel::MessageCounterManager gMessageCounterManager;
-
 chip::Inet::IPAddress gDestAddr;
 
 // The last time a CHIP Command was attempted to be sent.

diff --git a/src/app/tests/integration/chip_im_responder.cpp b/src/app/tests/integration/chip_im_responder.cpp
@@ -35,7 +35,6 @@
 #include <messaging/ExchangeMgr.h>
 #include <messaging/Flags.h>
 #include <platform/CHIPDeviceLayer.h>
-#include <protocols/secure_channel/MessageCounterManager.h>
 #include <protocols/secure_channel/PASESession.h>
 #include <support/ErrorStr.h>
 #include <system/SystemPacketBuffer.h>
@@ -131,9 +130,7 @@ CHIP_ERROR ReadSingleClusterData(ClusterInfo & aClusterInfo, TLV::TLVWriter & aW
 
 namespace {
 chip::TransportMgr<chip::Transport::UDP> gTransportManager;
-chip::SecureSessionMgr gSessionManager;
 chip::SecurePairingUsingTestSecret gTestPairing;
-chip::secure_channel::MessageCounterManager gMessageCounterManager;
 LivenessEventGenerator gLivenessGenerator;
 
 uint8_t gDebugEventBuffer[2048];

diff --git a/src/app/tests/integration/common.cpp b/src/app/tests/integration/common.cpp
@@ -30,8 +30,9 @@
 #include <platform/CHIPDeviceLayer.h>
 #include <support/ErrorStr.h>
 
-// The ExchangeManager global object.
 chip::Messaging::ExchangeManager gExchangeManager;
+chip::SecureSessionMgr gSessionManager;
+chip::secure_channel::MessageCounterManager gMessageCounterManager;
 
 void InitializeChip(void)
 {
@@ -57,8 +58,10 @@ void InitializeChip(void)
 
 void ShutdownChip(void)
 {
-    gExchangeManager.Shutdown();
     chip::DeviceLayer::PlatformMgr().Shutdown();
+    gMessageCounterManager.Shutdown();
+    gExchangeManager.Shutdown();
+    gSessionManager.Shutdown();
 }
 
 void TLVPrettyPrinter(const char * aFormat, ...)

diff --git a/src/app/tests/integration/common.h b/src/app/tests/integration/common.h
@@ -26,11 +26,14 @@
 
 #include <app/util/basic-types.h>
 #include <messaging/ExchangeMgr.h>
+#include <protocols/secure_channel/MessageCounterManager.h>
 
 #define MAX_MESSAGE_SOURCE_STR_LENGTH (100)
 #define NETWORK_SLEEP_TIME_MSECS (100 * 1000)
 
 extern chip::Messaging::ExchangeManager gExchangeManager;
+extern chip::SecureSessionMgr gSessionManager;
+extern chip::secure_channel::MessageCounterManager gMessageCounterManager;
 
 constexpr chip::NodeId kTestNodeId           = 0x1ULL;
 constexpr chip::NodeId kTestNodeId1          = 0x2ULL;