Merge pull request #5331 from aws-lumberyard-dev/LYN-8035_MultiplayerFlakyTestFix

Moving Flaky Multiplayer Tests into Sandbox

AutomatedTesting/Gem/PythonTests/CMakeLists.txt

@@ -59,5 +59,8 @@ add_subdirectory(smoke)
 ## AWS ##
 add_subdirectory(AWS)
 
+## Multiplayer ##
+add_subdirectory(Multiplayer)
+
 ## Integration tests for editor testing framework ##
 add_subdirectory(editor_test_testing)

AutomatedTesting/Gem/PythonTests/Multiplayer/CMakeLists.txt

@@ -8,10 +8,10 @@
 
 if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
     ly_add_pytest(
-        NAME AutomatedTesting::MultiplayerTests_Main
-        TEST_SUITE main
+        NAME AutomatedTesting::MultiplayerTests_Sandbox
+        TEST_SUITE sandbox
         TEST_SERIAL
-        PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Main.py
+        PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Sandbox.py
         RUNTIME_DEPENDENCIES
             Legacy::Editor
             AZ::AssetProcessor

AutomatedTesting/Gem/PythonTests/Multiplayer/TestSuite_Main.py

@@ -27,7 +27,3 @@ class TestAutomation(TestAutomationBase):
             batch_mode=batch_mode,
             autotest_mode=autotest_mode)
 
-    def test_Multiplayer_AutoComponent_NetworkInput(self, request, workspace, editor, launcher_platform):
-        from .tests import Multiplayer_AutoComponent_NetworkInput as test_module
-        self._run_prefab_test(request, workspace, editor, test_module)
-

AutomatedTesting/Gem/PythonTests/Multiplayer/TestSuite_Sandbox.py

@@ -0,0 +1,35 @@
+"""
+Copyright (c) Contributors to the Open 3D Engine Project.
+For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+
+"""
+
+# This suite consists of all test cases that are under development and have not been verified yet.
+# Once they are verified, please move them to TestSuite_Active.py
+
+import pytest
+import os
+import sys
+
+
+sys.path.append(os.path.dirname(os.path.abspath(__file__)) + '/../automatedtesting_shared')
+
+from base import TestAutomationBase
+
+@pytest.mark.SUITE_sandbox
+@pytest.mark.parametrize("project", ["AutomatedTesting"])
+@pytest.mark.parametrize("launcher_platform", ['windows_editor'])
+class TestAutomation(TestAutomationBase):
+    def _run_prefab_test(self, request, workspace, editor, test_module, batch_mode=True, autotest_mode=True):
+        self._run_test(request, workspace, editor, test_module, 
+            extra_cmdline_args=["--regset=/Amazon/Preferences/EnablePrefabSystem=true"], 
+            batch_mode=batch_mode,
+            autotest_mode=autotest_mode)
+
+    ## Seems to be flaky, need to investigate
+    def test_Multiplayer_AutoComponent_NetworkInput(self, request, workspace, editor, launcher_platform):
+        from .tests import Multiplayer_AutoComponent_NetworkInput as test_module
+        self._run_prefab_test(request, workspace, editor, test_module)
+