Fixes for android nightly unit tests

- Fix broken test launcher caused by change in unit test module registry format
- Fix test runner script's ENGINE_ROOT (re-parenting) path caused by move of file to different folder
- Adding step to always perform an android sdk update to latest creating and launching android virtual device (AVD)
This commit is contained in:
spham
2021-04-15 11:57:23 -07:00
parent 14f7883425
commit dbae71c511
2 changed files with 18 additions and 4 deletions
+6 -3
View File
@@ -628,8 +628,8 @@ def get_test_module_registry(build_dir_path):
test_module_items = unit_test_json['Amazon']
for _, test_module_item in test_module_items.items():
module_file = test_module_item['Modules']
dep_modules.append(module_file)
module_files = test_module_item['Modules']
dep_modules.extend(module_files)
except FileNotFoundError:
raise LmbrCmdError(f"Unit test registry not found ('{str(unit_test_module_path)}')")
@@ -659,7 +659,10 @@ def get_validated_test_modules(test_modules, build_dir_path):
for test_target_check in test_modules:
if test_target_check not in all_test_modules:
raise LmbrCmdError(f"Invalid test module {test_target_check}")
validated_test_modules.append(test_target_check)
if isinstance(test_target_check, list):
validated_test_modules.extend(test_target_check)
else:
validated_test_modules.append(test_target_check)
else:
validated_test_modules = all_test_modules