From 16ea6355a761fa74add9a46fd349bee735d1d329 Mon Sep 17 00:00:00 2001
From: sharmajs-amzn <82233357+sharmajs-amzn@users.noreply.github.com>
Date: Mon, 23 Aug 2021 08:28:24 -0700
Subject: [PATCH] {LYN-5375} asset bundler tests timing out (#3356)

* Enabling AssetBundler Tests

Signed-off-by: sharmajs-amzn <82233357+sharmajs-amzn@users.noreply.github.com>

* enabling fast scan

Signed-off-by: sharmajs-amzn <82233357+sharmajs-amzn@users.noreply.github.com>
---
 .../ap_fixtures/bundler_batch_setup_fixture.py  |  2 +-
 .../asset_processor_tests/CMakeLists.txt        | 17 ++---------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/bundler_batch_setup_fixture.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/bundler_batch_setup_fixture.py
index a543527ed7..ff362c732c 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/bundler_batch_setup_fixture.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/bundler_batch_setup_fixture.py
@@ -342,7 +342,7 @@ def bundler_batch_setup_fixture(request, workspace, asset_processor, timeout) ->
     # Run a full scan to ENSURE that both caches (pc and osx) are COMPLETELY POPULATED
     # Needed for asset bundling
     # fmt:off
-    assert asset_processor.batch_process(fastscan=False, timeout=timeout * len(platforms), platforms=platforms_list), \
+    assert asset_processor.batch_process(fastscan=True, timeout=timeout * len(platforms), platforms=platforms_list), \
         "AP Batch failed to process in bundler_batch_fixture"
     # fmt:on
 
diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt
index 3d7a9204e2..5a5809595e 100644
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt
@@ -92,25 +92,12 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
             AZ::AssetProcessor
     )
 
-    # Issue #3017
-    #ly_add_pytest(
-    #    NAME AssetPipelineTests.AssetBundler
-    #    PATH ${CMAKE_CURRENT_LIST_DIR}/asset_bundler_batch_tests.py
-    #    EXCLUDE_TEST_RUN_TARGET_FROM_IDE
-    #    TEST_SERIAL 
-    #    TEST_SUITE periodic
-    #    RUNTIME_DEPENDENCIES
-    #        AZ::AssetProcessor
-    #        AZ::AssetBundlerBatch
-    #)
-
     ly_add_pytest(
-        NAME AssetPipelineTests.AssetBundler_SandBox
-        TEST_SUITE sandbox
+        NAME AssetPipelineTests.AssetBundler
         PATH ${CMAKE_CURRENT_LIST_DIR}/asset_bundler_batch_tests.py
-        PYTEST_MARKS "SUITE_sandbox" # run only sandbox tests in this file
         EXCLUDE_TEST_RUN_TARGET_FROM_IDE
         TEST_SERIAL 
+        TEST_SUITE periodic
         RUNTIME_DEPENDENCIES
             AZ::AssetProcessor
             AZ::AssetBundlerBatch