birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,189 Commits 3 Branches 3 Tags
342b1ee47c8024260b89d68998aeee8ee2f88477
Commit Graph

92 Commits

Author SHA1 Message Date
chiyenteng f91c605144 Fix prefab/instance name inconsistency issue in automated testing's prefab utils (#7122) 
* Ensure to fire OnEditorEntityCreated notification in SandboxIntegrationManager::CreateNewEntityAtPosition

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* Ensure to fire OnEditorEntityCreated notification in SandboxIntegrationManager::CreateNewEntityAtPosition

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* convert test AreaNodes_DependentComponentsAdded to use prefab system

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* Prevent SetupEditorEntity being called twice

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* Fix prefab utils prefab naming issue

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* revert test changes

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* fix a grammatical error

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>
 2022-01-25 14:57:16 -08:00
Scott Murray 74c8561fd0 bringing in latest develoment 
Signed-off-by: Scott Murray <scottmur@amazon.com>
 2022-01-24 13:13:23 -08:00
Scott Murray 6481b147fc style and other fixes 
Signed-off-by: Scott Murray <scottmur@amazon.com>
 2022-01-21 16:03:39 -08:00
Scott Murray 529c342eca fixing remove_components 
Signed-off-by: Scott Murray <scottmur@amazon.com>
 2022-01-21 14:53:11 -08:00
jckand-amzn 2c33240b72 Converting Dynamic Vegetation and Gradient Signal tests to utilize prefab system (#7034) 
* Adding on-disk prefabs for automated tests

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Resolving import conflict with cherrypick

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Updating DynVeg tests to use open_base_level function

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Converting initial set of DynVeg tests to utilize prefab system

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Finalizing DynVeg test conversion to use prefab system

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Removing old test runners

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Removing optimized suffix from optimized test runners

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Removing unoptimized test runner

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Removing optimized suffix from optimized test runner

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Adding wait_for_condition on level save for E2E tests

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>
 2022-01-21 11:55:19 -08:00
Scott Murray d323edcfae bringing in latest development 
Signed-off-by: Scott Murray <scottmur@amazon.com>
 2022-01-12 14:11:14 -08:00
Scott Murray aebf93d882 fixing a typo in docstring 
Signed-off-by: Scott Murray <scottmur@amazon.com>
 2022-01-12 13:13:52 -08:00
Scott Murray 2492c0a4f4 enum must be dereferenced with .value also added get_outcome.GetError() to pull more information from any get_container_item failures 
Signed-off-by: Scott Murray <scottmur@amazon.com>
 2022-01-06 17:56:00 -08:00
Scott Murray 5f9a4a5eed docstring clarification and addressing review comments 
Signed-off-by: Scott Murray <scottmur@amazon.com>
 2022-01-05 17:21:55 -08:00
Scott Murray d343caa3f2 add optional force_get to get_property_tree 
Signed-off-by: Scott Murray <scottmur@amazon.com>
 2022-01-04 11:58:17 -08:00
jckand-amzn 3bc42143e2 Merge branch 'development' of https://github.com/o3de/o3de into jckand/EditorPrefabTests 
Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>
 2022-01-04 08:18:53 -06:00
Scott Murray a7d173db3d changes from review and switching to assert model instead of return bool 
Signed-off-by: Scott Murray <scottmur@amazon.com>
 2022-01-03 16:15:35 -08:00
jckand-amzn 955a6db374 Converting Editor automated tests to utilize prefab system 
Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>
 2021-12-30 15:56:27 -06:00
Gene Walters 26a5128576 Renaming py util methods for reporting log lines based on feedback 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-12-29 10:02:32 -08:00
Gene Walters 0b78c377f8 Minor: py method comment added 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-12-27 09:39:04 -08:00
Gene Walters 8b041f5280 merging latest dev 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-12-18 10:34:49 -08:00
Gene Walters d508d5c4c2 Updating pytest code comments and RPC name based on review feedback 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-12-17 17:49:36 -08:00
Scott Murray 291e172f9e fixing some docstrings 
Signed-off-by: Scott Murray <scottmur@amazon.com>
 2021-12-16 21:01:39 -08:00
Scott Murray 9b5dcf82b5 updates extend editor_entity_utils.py functionality 
Signed-off-by: Scott Murray <scottmur@amazon.com>
 2021-12-16 20:46:12 -08:00
chiyenteng ca49eedc5f Convert prefab to temp spawnable assets (#6179) 
* Convert prefab to temp in-memory spawnable assets

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>
 2021-12-10 10:55:01 -08:00
Gene Walters 0a7e9388ad Cleanup: Adding wait_for_critical_expected_line as a public method to utils.py and updated the RPC test to use it. 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-12-09 19:23:48 -08:00
Gene Walters 4b3d1452fd Merge pull request #6066 from aws-lumberyard-dev/LYN-8514_AutomatedReviewServerLogChecks 
Updating Multiplayer PyTests To Check Server Logs
 2021-12-09 09:15:58 -08:00
John Jones-Steele 9e7d5fe52b Test the Terrain World configuration changes when parameters are chan… (#6063) 
* Test the Terrain World configuration changes when parameters are changed in the component

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Changes from PR

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Before merge

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Before merge 2

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Changes from PR

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Change from PR

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Change before merge

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Change before merge 2

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Change before merge 3

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Change after merge to fix conflicts

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Fix merge conflict

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Fix merge conflict

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* CHanges from PR

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
 2021-12-08 14:09:56 +00:00
jromnoa 9038cdfcf9 fix merge conflict between constants in atom_constants.py 
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
 2021-12-06 17:53:31 -08:00
jromnoa ad3148ece5 add new enter_exit_game_mode_take_screenshot() shared function 
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
 2021-12-06 16:05:55 -08:00
Gene Walters 9ae3da7acd Merge branch 'upstream/development' into LYN-8514_AutomatedReviewServerLogChecks 2021-12-06 11:30:12 -08:00
smurly e3306f948f Atom Level component test support in editor_entity_utils.py and tests for level components (#6082) 
* Level component helper and test cases for Atom Level components which currently crash

Signed-off-by: Scott Murray <scottmur@amazon.com>

* moved a close paren to end of previous line to match existing style

Signed-off-by: Scott Murray <scottmur@amazon.com>

* adding a forgotten import

Signed-off-by: Scott Murray <scottmur@amazon.com>

* minor refactor and prep for adding back the Display Mapper Game component test

Signed-off-by: Scott Murray <scottmur@amazon.com>

* putting Game compoenent Display Mapper test back with addition of setting property Enabled to true

Signed-off-by: Scott Murray <scottmur@amazon.com>

* typo in line fixed Test. bocomes Tests.

Signed-off-by: Scott Murray <scottmur@amazon.com>
 2021-12-06 12:18:16 -05:00
jromnoa cc76ee58a7 update light component constant, fixed the return value for find_editor_entity(), removed old GPU test scripts, added new GPU test scripts 
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
 2021-12-01 18:46:58 -08:00
jckand-amzn 68bf7c85ed Adding setup step to remove temporary level that fails to cleanup (#6056) 
* Adding setup step to remove temporary level that fails to cleanup with test teardown

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Adding new create_level to TestHelper class with additional error logging

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Cleaning up custom setup/teardown

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>
 2021-12-01 11:17:08 -08:00
Gene Walters c8b631054f Misc edit to keep an AZLOG_INFO instead of AZPrint. No real difference, but good as an example for pytest 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-12-01 10:04:26 -08:00
Gene Walters 4b079b7608 Merge branch 'upstream/development' into LYN-8514_AutomatedReviewServerLogChecks 2021-11-30 14:34:42 -08:00
Esteban Papp 7c30adb66c Removes _vs2019 from jenkins jobs and documentation (#5855) 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-30 11:10:02 -08:00
srikappa-amzn 4dd9e94bc3 Add tests for deleting an entity from the level and from another prefab (#5839) 
* Added tests for deleting entity under level and other prefabs

Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com>

* Added class comments and improved variable names

Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com>

* Called the reflect function of PrefabFocusHandler from PrefabSystemComponent

Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com>

* Added function comments and made an if statement to be one line

Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com>
 2021-11-30 08:20:25 -08:00
Gene Walters f4e762d9bd Adding warning if server fails to load the sv_defaultPlayerSpawnAsset when a client joins the server. Updating Multiplayer PyTest to watch out for this warning. 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-11-29 16:36:28 -08:00
Gene Walters 75e8ef8089 Misc cleanup. Making sure ServerLauncher closes if tests fail 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-11-29 13:36:41 -08:00
Gene Walters 97b27513e9 Editor is now listening to editor-server stdout so adding newlines to lines we care about. (Editor is separating out the log lines based on newline) 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-11-23 19:27:16 -08:00
Esteban Papp ccb5336843 Reading 3rdparty from manifest if it exists (#5840) 
* Reading 3rdparty from manifest if it exists, removnig the need to pass it across the board, updated jenkins paths so 3rdparty is put into the workspace

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Removes unneded space

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Changes how we get the NDK folder

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* needs delayed expansion

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Ninja is in the path, is not needed for Android

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-22 14:21:02 -08:00
chiyenteng ab76254b43 Make prefab system enabled as default for automated tests (#5670) 
* Make prefab system enabled as default for automated tests

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* Modify auto tests after preventing regset saved into disk after editor main window closed

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* Uncomment xfail

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* Use --regset for editor tests

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>
 2021-11-22 10:45:18 -08:00
puvvadar 5f0823f3c0 Merge commit '551e6010ddf1f04b3d3d289ef73bacbe4477fa2a' into puvvadar/gitflow_211118_o3de 2021-11-18 09:36:35 -08:00
Mike Balfour 551e6010dd Add support for getting the level entity when prefabs are enabled. (#5680) 
* Add support for getting the level entity when prefabs are enabled.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Made a little prettier.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Addressed PR feedback plus fixed the crash when the level component failed to add.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
 2021-11-16 19:23:53 -06:00
jckand-amzn 05caf1b29d Removed redundant append to components list from add_component() 
Signed-off-by: jckand-amzn <jckand@amazon.com>
 2021-11-15 17:50:42 -06:00
jckand-amzn 11c219701e Initial check-in of in-memory prefab creation helpers for Dynamic Vegetation tests 
Signed-off-by: jckand-amzn <jckand@amazon.com>
 2021-11-12 15:47:18 -06:00
Gene Walters 2a3667f7b0 Merge branch 'upstream/development' into LYN-6770_AutomatedTestNetInputs 2021-11-01 20:23:27 -07:00
Gene Walters fa32940205 Adding logs to dedicated-server start up (unable to use for automated testing just yet since remote console cant be connected that early). Adding pytest check to make sure AutomatedTesting.ServerLauncher is running. Moved sveditor_port to MultiplayerEditorConnection since it was never actually getting used when it was in EditorSystemComponent (dedicated servers dont know about editor) 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-11-01 13:01:59 -07:00
AMZN-AlexOteiza e871dff70e Added two complex prefab tests (#5089) 
* Added two complex prefab tests

* Fix compile error

* Added extra methods, fixed test failure

* Addressed PR commments

* More PR comments

* Fix space

* Fix ar error
 2021-10-29 22:32:33 +01:00
Gene Walters 2f38873e03 Adding logs for successful steps occurring in the editor-server process. AutomatedTesting will expect these logs and can be helpful to narrow down any test fails 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-10-29 13:55:32 -07:00
Gene Walters 48c438f469 Reverting the debugging code I was using to narrow down the problem on Jenkins now that the issue was fixed by PR-4946 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-10-28 09:42:13 -07:00
Gene Walters c9a02e3c8a Revert "Lowering timeout so pytest doesnt abort, but still get mode time to read the server logs" 
This reverts commit 8380c5ff24.

Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-10-28 09:42:10 -07:00
Gene Walters 8380c5ff24 Lowering timeout so pytest doesnt abort, but still get mode time to read the server logs 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-10-23 16:41:30 -07:00
Gene Walters 3d7346ac32 increasing multiplayer is-in-game timeout, going to try this on Jenkin. Maybe AssetProcessor isn't finished and thats why its failing? 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-10-23 16:02:41 -07:00