From 43ffb2c872f4597b305f435db8ece39ab290872e Mon Sep 17 00:00:00 2001
From: pereslav <pereslav@amazon.com>
Date: Mon, 24 May 2021 19:51:16 +0100
Subject: [PATCH] SPEC-6984 Fixed flaky test when user settings were written by
 ComponentApplication

---
 Gems/Multiplayer/Code/Tests/MainTools.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Gems/Multiplayer/Code/Tests/MainTools.cpp b/Gems/Multiplayer/Code/Tests/MainTools.cpp
index ccb4d568f8..6879733d1b 100644
--- a/Gems/Multiplayer/Code/Tests/MainTools.cpp
+++ b/Gems/Multiplayer/Code/Tests/MainTools.cpp
@@ -11,6 +11,7 @@
 */
 
 #include <AzCore/UnitTest/UnitTest.h>
+#include <AzCore/UserSettings/UserSettingsComponent.h>
 #include <AzQtComponents/Utilities/QtPluginPaths.h>
 #include <AzTest/AzTest.h>
 #include <AzTest/GemTestEnvironment.h>
@@ -39,6 +40,15 @@ namespace Multiplayer
 
             AddComponentDescriptors(descriptors);
         }
+
+        /// Allows derived environments to override to perform additional steps after the system entity is activated.
+        void PostSystemEntityActivate() override
+        {
+            // Without this, the user settings component would attempt to save on finalize/shutdown. Since the file is
+            // shared across the whole engine, if multiple tests are run in parallel, the saving could cause a crash
+            // in the unit tests.
+            AZ::UserSettingsComponentRequestBus::Broadcast(&AZ::UserSettingsComponentRequests::DisableSaveOnFinalize);
+        }
     };
 } // namespace UnitTest