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

Integrating github/staging through commit ab87ed9

Browse Source
This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AutomatedTesting/Gem/PythonTests/physics/FileManagement.py
+2 -2
View File
@@ -264,7 +264,7 @@ class FileManagement:
"""
root_path = parent_path
if root_path is not None:
root_path = os.path.join(workspace.paths.dev(), root_path)
root_path = os.path.join(workspace.paths.engine_root(), root_path)
else:
# Default to project folder (AutomatedTesting)
root_path = workspace.paths.project()
@@ -325,7 +325,7 @@ class FileManagement:
"""
root_path = parent_path
if root_path is not None:
root_path = os.path.join(workspace.paths.dev(), root_path)
root_path = os.path.join(workspace.paths.engine_root(), root_path)
else:
# Default to project folder (AutomatedTesting)
root_path = workspace.paths.project()
AutomatedTesting/Gem/PythonTests/physics/TestSuite_Active.py
+41 -50
View File
@@ -27,7 +27,7 @@ from base import TestAutomationBase
revert_physics_config = fm.file_revert_list(['physxdebugconfiguration.setreg', 'physxdefaultsceneconfiguration.setreg', 'physxsystemconfiguration.setreg'], 'AutomatedTesting/Registry')
@pytest.mark.SUITE_sandbox
@pytest.mark.SUITE_main
@pytest.mark.parametrize("launcher_platform", ['windows_editor'])
@pytest.mark.parametrize("project", ["AutomatedTesting"])
class TestAutomation(TestAutomationBase):
@@ -42,16 +42,6 @@ class TestAutomation(TestAutomationBase):
from . import C100000_RigidBody_EnablingGravityWorksPoC as test_module
self._run_test(request, workspace, editor, test_module)
@revert_physics_config
def test_C100000_RigidBody_EnablingGravityWorksPoC(self, request, workspace, editor, launcher_platform):
from . import C100000_RigidBody_EnablingGravityWorksPoC as test_module
self._run_test(request, workspace, editor, test_module)
@revert_physics_config
def test_C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC(self, request, workspace, editor, launcher_platform):
from . import C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC as test_module
self._run_test(request, workspace, editor, test_module)
@revert_physics_config
def test_C3510642_Terrain_NotCollideWithTerrain(self, request, workspace, editor, launcher_platform):
from . import C3510642_Terrain_NotCollideWithTerrain as test_module
@@ -72,11 +62,6 @@ class TestAutomation(TestAutomationBase):
from . import C4976207_PhysXRigidBodies_KinematicBehavior as test_module
self._run_test(request, workspace, editor, test_module)
@revert_physics_config
def test_C5932040_ForceRegion_CubeExertsWorldForce(self, request, workspace, editor, launcher_platform):
from . import C5932040_ForceRegion_CubeExertsWorldForce as test_module
self._run_test(request, workspace, editor, test_module)
@revert_physics_config
def test_C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies(self, request, workspace, editor, launcher_platform):
from . import C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies as test_module
@@ -92,16 +77,6 @@ class TestAutomation(TestAutomationBase):
from . import C5932043_ForceRegion_SimpleDragOnRigidBodies as test_module
self._run_test(request, workspace, editor, test_module)
@revert_physics_config
def test_C5932044_ForceRegion_PointForceOnRigidBody(self, request, workspace, editor, launcher_platform):
from . import C5932044_ForceRegion_PointForceOnRigidBody as test_module
self._run_test(request, workspace, editor, test_module)
@revert_physics_config
def test_C5959759_RigidBody_ForceRegionSpherePointForce(self, request, workspace, editor, launcher_platform):
from . import C5959759_RigidBody_ForceRegionSpherePointForce as test_module
self._run_test(request, workspace, editor, test_module)
@revert_physics_config
def test_C5959760_PhysXForceRegion_PointForceExertion(self, request, workspace, editor, launcher_platform):
from . import C5959760_PhysXForceRegion_PointForceExertion as test_module
@@ -288,11 +263,6 @@ class TestAutomation(TestAutomationBase):
from . import C4982798_Collider_ColliderRotationOffset as test_module
self._run_test(request, workspace, editor, test_module)
@revert_physics_config
def test_C5959809_ForceRegion_RotationalOffset(self, request, workspace, editor, launcher_platform):
from . import C5959809_ForceRegion_RotationalOffset as test_module
self._run_test(request, workspace, editor, test_module)
@revert_physics_config
def test_C12712453_ScriptCanvas_MultipleRaycastNode(self, request, workspace, editor, launcher_platform):
from . import C12712453_ScriptCanvas_MultipleRaycastNode as test_module
@@ -474,16 +444,6 @@ class TestAutomation(TestAutomationBase):
from . import C19578018_ShapeColliderWithNoShapeComponent as test_module
self._run_test(request, workspace, editor, test_module)
@revert_physics_config
def test_C15096740_Material_LibraryUpdatedCorrectly(self, request, workspace, editor, launcher_platform):
from . import C15096740_Material_LibraryUpdatedCorrectly as test_module
self._run_test(request, workspace, editor, test_module)
@revert_physics_config
def test_C4976236_AddPhysxColliderComponent(self, request, workspace, editor, launcher_platform):
from . import C4976236_AddPhysxColliderComponent as test_module
self._run_test(request, workspace, editor, test_module)
@revert_physics_config
def test_C14861500_DefaultSetting_ColliderShape(self, request, workspace, editor, launcher_platform):
from . import C14861500_DefaultSetting_ColliderShape as test_module
@@ -514,11 +474,6 @@ class TestAutomation(TestAutomationBase):
from . import C4982801_PhysXColliderShape_CanBeSelected as test_module
self._run_test(request, workspace, editor, test_module)
@revert_physics_config
def test_C14861502_PhysXCollider_AssetAutoAssigned(self, request, workspace, editor, launcher_platform):
from . import C14861502_PhysXCollider_AssetAutoAssigned as test_module
self._run_test(request, workspace, editor, test_module)
@revert_physics_config
def test_C4982802_PhysXColliderShape_CanBeSelected(self, request, workspace, editor, launcher_platform):
from . import C4982802_PhysXColliderShape_CanBeSelected as test_module
@@ -527,16 +482,44 @@ class TestAutomation(TestAutomationBase):
def test_C17411467_AddPhysxRagdollComponent(self, request, workspace, editor, launcher_platform):
from . import C17411467_AddPhysxRagdollComponent as test_module
self._run_test(request, workspace, editor, test_module)
def test_C14861501_PhysXCollider_RenderMeshAutoAssigned(self, request, workspace, editor, launcher_platform):
from . import C14861501_PhysXCollider_RenderMeshAutoAssigned as test_module
self._run_test(request, workspace, editor, test_module)
def test_C12905528_ForceRegion_WithNonTriggerCollider(self, request, workspace, editor, launcher_platform):
from . import C12905528_ForceRegion_WithNonTriggerCollider as test_module
# Fixme: expected_lines = ["[Warning] (PhysX Force Region) - Please ensure collider component marked as trigger exists in entity"]
self._run_test(request, workspace, editor, test_module)
def test_C5932040_ForceRegion_CubeExertsWorldForce(self, request, workspace, editor, launcher_platform):
from . import C5932040_ForceRegion_CubeExertsWorldForce as test_module
self._run_test(request, workspace, editor, test_module)
def test_C5932044_ForceRegion_PointForceOnRigidBody(self, request, workspace, editor, launcher_platform):
from . import C5932044_ForceRegion_PointForceOnRigidBody as test_module
self._run_test(request, workspace, editor, test_module)
def test_C5959759_RigidBody_ForceRegionSpherePointForce(self, request, workspace, editor, launcher_platform):
from . import C5959759_RigidBody_ForceRegionSpherePointForce as test_module
self._run_test(request, workspace, editor, test_module)
def test_C5959809_ForceRegion_RotationalOffset(self, request, workspace, editor, launcher_platform):
from . import C5959809_ForceRegion_RotationalOffset as test_module
self._run_test(request, workspace, editor, test_module)
def test_C15096740_Material_LibraryUpdatedCorrectly(self, request, workspace, editor, launcher_platform):
from . import C15096740_Material_LibraryUpdatedCorrectly as test_module
self._run_test(request, workspace, editor, test_module)
def test_C4976236_AddPhysxColliderComponent(self, request, workspace, editor, launcher_platform):
from . import C4976236_AddPhysxColliderComponent as test_module
self._run_test(request, workspace, editor, test_module)
def test_C14861502_PhysXCollider_AssetAutoAssigned(self, request, workspace, editor, launcher_platform):
from . import C14861502_PhysXCollider_AssetAutoAssigned as test_module
self._run_test(request, workspace, editor, test_module)
def test_C14861501_PhysXCollider_RenderMeshAutoAssigned(self, request, workspace, editor, launcher_platform):
from . import C14861501_PhysXCollider_RenderMeshAutoAssigned as test_module
self._run_test(request, workspace, editor, test_module)
def test_C4044695_PhysXCollider_AddMultipleSurfaceFbx(self, request, workspace, editor, launcher_platform):
from . import C4044695_PhysXCollider_AddMultipleSurfaceFbx as test_module
self._run_test(request, workspace, editor, test_module)
@@ -544,3 +527,11 @@ class TestAutomation(TestAutomationBase):
def test_C14861504_RenderMeshAsset_WithNoPxAsset(self, request, workspace, editor, launcher_platform):
from . import C14861504_RenderMeshAsset_WithNoPxAsset as test_module
self._run_test(request, workspace, editor, test_module)
def test_C100000_RigidBody_EnablingGravityWorksPoC(self, request, workspace, editor, launcher_platform):
from . import C100000_RigidBody_EnablingGravityWorksPoC as test_module
self._run_test(request, workspace, editor, test_module)
def test_C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC(self, request, workspace, editor, launcher_platform):
from . import C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC as test_module
self._run_test(request, workspace, editor, test_module)
AutomatedTesting/Gem/PythonTests/physics/TestSuite_InDevelopment.py
+1 -1
View File
@@ -388,4 +388,4 @@ class TestAutomation(TestAutomationBase):
expected_lines = []
unexpected_lines = ["Assert"]
self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines)
self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines)