From 4ff120ac7309c5fcaeeaeaed580dbaa08f89038a Mon Sep 17 00:00:00 2001
From: evanchia <evanchia@amazon.com>
Date: Fri, 28 May 2021 11:28:03 -0700
Subject: [PATCH] Only moving the failing test via pytest marks

---
 .../Gem/PythonTests/smoke/CMakeLists.txt       | 18 ++++++++++++++++++
 .../test_Editor_NewExistingLevels_Works.py     |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt
index 7d946ee6e1..95b6a16ba4 100644
--- a/AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt
@@ -14,6 +14,24 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
         TEST_SUITE sandbox
         TEST_SERIAL
         PATH ${CMAKE_CURRENT_LIST_DIR}
+        PYTEST_MARKS "SUITE_smoke"
+        TIMEOUT 1500
+        RUNTIME_DEPENDENCIES
+            AZ::AssetProcessor
+            AZ::PythonBindingsExample
+            Legacy::Editor
+            AutomatedTesting.GameLauncher
+            AutomatedTesting.Assets
+        COMPONENT
+            Smoke
+    )
+
+    ly_add_pytest(
+        NAME AutomatedTesting::SandboxTest
+        TEST_SUITE sandbox
+        TEST_SERIAL
+        PATH ${CMAKE_CURRENT_LIST_DIR}
+        PYTEST_MARKS "SUITE_sandbox"
         TIMEOUT 1500
         RUNTIME_DEPENDENCIES
             AZ::AssetProcessor
diff --git a/AutomatedTesting/Gem/PythonTests/smoke/test_Editor_NewExistingLevels_Works.py b/AutomatedTesting/Gem/PythonTests/smoke/test_Editor_NewExistingLevels_Works.py
index 985740307f..e6b072ba58 100644
--- a/AutomatedTesting/Gem/PythonTests/smoke/test_Editor_NewExistingLevels_Works.py
+++ b/AutomatedTesting/Gem/PythonTests/smoke/test_Editor_NewExistingLevels_Works.py
@@ -15,7 +15,7 @@ from automatedtesting_shared.base import TestAutomationBase
 import ly_test_tools.environment.file_system as file_system
 
 
-@pytest.mark.SUITE_smoke
+@pytest.mark.SUITE_sandbox
 @pytest.mark.parametrize("launcher_platform", ["windows_editor"])
 @pytest.mark.parametrize("project", ["AutomatedTesting"])
 @pytest.mark.parametrize("level", ["temp_level"])