Nighly build test fixes (#2727)

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

AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt

@@ -97,7 +97,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
         PATH ${CMAKE_CURRENT_LIST_DIR}/asset_bundler_batch_tests.py
         EXCLUDE_TEST_RUN_TARGET_FROM_IDE
         TEST_SERIAL 
-        TIMEOUT 1500
+        TIMEOUT 2400
         TEST_SUITE periodic
         RUNTIME_DEPENDENCIES
             AZ::AssetProcessor

AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_builder_tests.py

@@ -113,7 +113,7 @@ class TestsAssetBuilder_WindowsAndMac(object):
         if listening_port:
             corrupted_slice_command.append(f'-port={listening_port}')
         if workspace.project:
-            corrupted_slice_command.append(f'-gamename={workspace.project}')
+            corrupted_slice_command.append(f'--project-path={workspace.project}')
         corrupted_slice_output = utils.safe_subprocess(corrupted_slice_command)
 
         # Verify corrupted slice produced error

AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_bundler_batch_tests.py

@@ -902,7 +902,7 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
             second_input_arg = asset_lists_to_string(second_asset_list)  # --secondAssetList
             output_arg = asset_lists_to_string(output_file)  # --output
 
-            def generate_compare_command(platform_arg: str) -> object:
+            def generate_compare_command(platform_arg: str, project_name : str) -> object:
                 """Creates a string containing a full Compare command. This string can be executed as-is."""
                 cmd = [helper["bundler_batch"], "compare", f"--firstassetFile={first_input_arg}", f"--output={output_arg}"]
                 if platform_arg is not None:
@@ -918,6 +918,8 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
                     if comp_type == "4":
                         # Extra arguments for pattern comparison
                         cmd.extend([f"--filePatternType={pattern_type}", f"--filePattern={pattern}"])
+                if workspace.project:
+                    cmd.append(f'--project-path={project_name}')
                 return cmd
             # End generate_compare_command()
 
@@ -936,6 +938,7 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
             # End verify_asset_list_contents()
 
             def run_compare_command_and_verify(platform_arg: str, expect_pc_output: bool, expect_mac_output: bool) -> None:
+
                 # Expected asset list to equal result of comparison
                 expected_pc_asset_list = None
                 expected_mac_asset_list = None
@@ -957,7 +960,7 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
                     output_mac_asset_list = helper.platform_file_name(last_output_arg, platform)
 
                 # Build execution command
-                cmd = generate_compare_command(platform_arg)
+                cmd = generate_compare_command(platform_arg, workspace.project)
 
                 # Execute command
                 subprocess.check_call(cmd)
@@ -992,10 +995,12 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
                 f"--comparisonRulesFile={rule_file}",
                 f"--comparisonType={args[1]}",
                 r"--addComparison",
+                f"--project-path={workspace.project}",
             ]
             if args[1] == "4":
                 # If pattern comparison, append a few extra arguments
                 cmd.extend(["--filePatternType=0", "--filePattern=*.dat"])
+
             subprocess.check_call(cmd)
             assert os.path.exists(rule_file), f"Rule file {args[0]} was not created at location: {rule_file}"
 

Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py

@@ -594,7 +594,7 @@ class AssetProcessor(object):
         output_list = None
         if capture_output:
             if decode:
-                output_list = run_result.stdout.decode('utf-8').splitlines()
+                output_list = run_result.stdout.decode('utf-8', errors="replace").splitlines()
             else:
                 output_list = run_result.stdout.splitlines()