birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updating asset_bundler_batch_tests to Prefab/Spawnables instead of Level.pak (#6679)

Browse Source 
* Replaced TestDependenciesLevel's level.pak for TestDependenciesLevel.prefab to fix asset_bundler_batch_tests failure
Updated asset_bundler_batch_tests to reflect the update.

Signed-off-by: Rosario Cox <lesaelr@amazon.com>

* Missed one of the .spawnables changes

Signed-off-by: Rosario Cox <lesaelr@amazon.com>
This commit is contained in:
LesaelR
2022-01-10 10:15:51 -08:00
committed by GitHub
parent 5aa7d56f1a
commit 8e2e2d96c5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_bundler_batch_tests.py
+5 -5
View File
@@ -108,7 +108,7 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
""" """
helper = bundler_batch_helper helper = bundler_batch_helper
seed_list = os.path.join(workspace.paths.engine_root(), "Assets", "Engine", "SeedAssetList.seed") # Engine seed list seed_list = os.path.join(workspace.paths.engine_root(), "Assets", "Engine", "SeedAssetList.seed") # Engine seed list
asset = r"levels\testdependencieslevel\level.pak" asset = r"levels\testdependencieslevel\testdependencieslevel.spawnable"
# Create Asset list # Create Asset list
helper.call_assetLists( helper.call_assetLists(
@@ -191,7 +191,7 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
""" """
helper = bundler_batch_helper helper = bundler_batch_helper
seed_list = os.path.join(workspace.paths.engine_root(), "Assets", "Engine", "SeedAssetList.seed") # Engine seed list seed_list = os.path.join(workspace.paths.engine_root(), "Assets", "Engine", "SeedAssetList.seed") # Engine seed list
asset = r"levels\testdependencieslevel\level.pak" asset = r"levels\testdependencieslevel\testdependencieslevel.spawnable"
# Useful bundle locations / names (2 for comparing contents) # Useful bundle locations / names (2 for comparing contents)
# fmt:off # fmt:off
@@ -924,7 +924,7 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
# Create a seed file # Create a seed file
helper.call_seeds( helper.call_seeds(
seedListFile=helper["seed_list_file"], seedListFile=helper["seed_list_file"],
addSeed=r"levels\testdependencieslevel\level.pak", addSeed=r"levels\testdependencieslevel\testdependencieslevel.spawnable",
platform="pc", platform="pc",
) )
@@ -947,9 +947,9 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
# Specifying platform but not "add" or "remove" should fail # Specifying platform but not "add" or "remove" should fail
result, _ = helper.call_assetLists( result, _ = helper.call_assetLists(
assetListFile=helper["asset_info_file_request"], assetListFile=helper["asset_info_file_request"],
allowOverwrites="",
seedListFile=helper["seed_list_file"], seedListFile=helper["seed_list_file"],
platform="pc", platform="pc",
allowOverwrites="",
) )
assert result, "Overwriting with override threw an error" assert result, "Overwriting with override threw an error"
@@ -982,7 +982,7 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
request.addfinalizer(lambda: fs.delete([bundle_result_path], True, False)) request.addfinalizer(lambda: fs.delete([bundle_result_path], True, False))
bundles_folder = os.path.join(workspace.paths.project(), "Bundles") bundles_folder = os.path.join(workspace.paths.project(), "Bundles")
level_pak = r"levels\testdependencieslevel\level.pak" level_pak = r"levels\testdependencieslevel\testdependencieslevel.spawnable"
bundle_request_path = os.path.join(bundles_folder, "bundle.pak") bundle_request_path = os.path.join(bundles_folder, "bundle.pak")
bundle_result_path = os.path.join(bundles_folder, bundle_result_path = os.path.join(bundles_folder,
helper.platform_file_name("bundle.pak", workspace.asset_processor_platform)) helper.platform_file_name("bundle.pak", workspace.asset_processor_platform))