Ver Fonte

Moving intermittently failing test to Periodic suite

Signed-off-by: jckand-amzn <[email protected]>
jckand-amzn há 2 anos atrás
pai
commit
ced98c34d0

+ 13 - 0
AutomatedTesting/Gem/PythonTests/Terrain/CMakeLists.txt

@@ -21,4 +21,17 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
             Terrain
     )
 
+    ly_add_pytest(
+        NAME AutomatedTesting::TerrainTests_Periodic
+        TEST_SUITE periodic
+        TEST_SERIAL
+        PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Periodic.py
+        RUNTIME_DEPENDENCIES
+            Legacy::Editor
+            AZ::AssetProcessor
+            AutomatedTesting.Assets
+        COMPONENT
+            Terrain
+    )
+
 endif()

+ 0 - 3
AutomatedTesting/Gem/PythonTests/Terrain/TestSuite_Main.py

@@ -33,6 +33,3 @@ class TestAutomation(EditorTestSuite):
 
     class test_TerrainWorld_ConfigurationWorks(EditorSharedTest):
         from .EditorScripts import Terrain_World_ConfigurationWorks as test_module
-
-    class test_TerrainPhysicsCollider_MaterialMapping_Works(EditorSharedTest):
-        from .EditorScripts import TerrainPhysicsCollider_MaterialMapping_Works as test_module

+ 19 - 0
AutomatedTesting/Gem/PythonTests/Terrain/TestSuite_Periodic.py

@@ -0,0 +1,19 @@
+"""
+Copyright (c) Contributors to the Open 3D Engine Project.
+For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+"""
+
+import pytest
+
+from ly_test_tools.o3de.editor_test import EditorTestSuite, EditorSharedTest
+
+
[email protected]_periodic
[email protected]("launcher_platform", ['windows_editor'])
[email protected]("project", ["AutomatedTesting"])
+class TestAutomation(EditorTestSuite):
+
+    class test_TerrainPhysicsCollider_MaterialMapping_Works(EditorSharedTest):
+        from .EditorScripts import TerrainPhysicsCollider_MaterialMapping_Works as test_module

+ 53 - 66
AutomatedTesting/Levels/Terrain/TerrainPhysicsCollider_MaterialMapping_Works/TerrainPhysicsCollider_MaterialMapping_Works.prefab

@@ -42,14 +42,15 @@
                 "$type": "EditorTerrainWorldComponent",
                 "Id": 16439252587045735872
             },
+            "Component_[17289454741407577043]": {
+                "$type": "LocalViewBookmarkComponent",
+                "Id": 17289454741407577043,
+                "LocalBookmarkFileName": "TerrainPhysicsCollider_MaterialMapping_Works_16674923282247643.setreg"
+            },
             "Component_[5688118765544765547]": {
                 "$type": "EditorEntityIconComponent",
                 "Id": 5688118765544765547
             },
-            "Component_[6545738857812235305]": {
-                "$type": "SelectionComponent",
-                "Id": 6545738857812235305
-            },
             "Component_[7247035804068349658]": {
                 "$type": "EditorPrefabComponent",
                 "Id": 7247035804068349658
@@ -76,10 +77,6 @@
             "Id": "Entity_[1155164325235]",
             "Name": "Sun",
             "Components": {
-                "Component_[10440557478882592717]": {
-                    "$type": "SelectionComponent",
-                    "Id": 10440557478882592717
-                },
                 "Component_[13620450453324765907]": {
                     "$type": "EditorLockComponent",
                     "Id": 13620450453324765907
@@ -156,7 +153,7 @@
                     "Controller": {
                         "Configuration": {
                             "Field of View": 55.0,
-                            "EditorEntityId": 6154987512225103865
+                            "EditorEntityId": 8616034677590180771
                         }
                     }
                 },
@@ -185,10 +182,6 @@
                         ]
                     }
                 },
-                "Component_[18387556550380114975]": {
-                    "$type": "SelectionComponent",
-                    "Id": 18387556550380114975
-                },
                 "Component_[2654521436129313160]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 2654521436129313160
@@ -240,10 +233,6 @@
                     "$type": "EditorLockComponent",
                     "Id": 14988041764659020032
                 },
-                "Component_[15808690248755038124]": {
-                    "$type": "SelectionComponent",
-                    "Id": 15808690248755038124
-                },
                 "Component_[15900837685796817138]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 15900837685796817138
@@ -294,10 +283,6 @@
                         }
                     }
                 },
-                "Component_[11980494120202836095]": {
-                    "$type": "SelectionComponent",
-                    "Id": 11980494120202836095
-                },
                 "Component_[1428633914413949476]": {
                     "$type": "EditorLockComponent",
                     "Id": 1428633914413949476
@@ -322,6 +307,20 @@
                                 "assetHint": "lightingpresets/highcontrast/goegap_4k_iblglobalcm_iblspecular.exr.streamingimage"
                             }
                         }
+                    },
+                    "diffuseImageAsset": {
+                        "assetId": {
+                            "guid": "{3FD09945-D0F2-55C8-B9AF-B2FD421FE3BE}",
+                            "subId": 3000
+                        },
+                        "assetHint": "lightingpresets/highcontrast/goegap_4k_iblglobalcm_ibldiffuse.exr.streamingimage"
+                    },
+                    "specularImageAsset": {
+                        "assetId": {
+                            "guid": "{3FD09945-D0F2-55C8-B9AF-B2FD421FE3BE}",
+                            "subId": 2000
+                        },
+                        "assetHint": "lightingpresets/highcontrast/goegap_4k_iblglobalcm_iblspecular.exr.streamingimage"
                     }
                 },
                 "Component_[14994774102579326069]": {
@@ -428,12 +427,17 @@
                     "Configuration": {
                         "entityId": "",
                         "Mass": 999.9999389648438,
-                        "Inertia tensor": {
-                            "roll": 0.0,
-                            "pitch": 0.0,
-                            "yaw": 0.0,
-                            "scale": 0.005999999586492777
-                        }
+                        "Inertia tensor": [
+                            166.6666717529297,
+                            0.0,
+                            0.0,
+                            0.0,
+                            166.6666717529297,
+                            0.0,
+                            0.0,
+                            0.0,
+                            166.6666717529297
+                        ]
                     }
                 },
                 "Component_[15496502846084008866]": {
@@ -444,10 +448,6 @@
                     "$type": "EditorEntitySortComponent",
                     "Id": 18392511014948595626
                 },
-                "Component_[3579014362228884389]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3579014362228884389
-                },
                 "Component_[3668609610460496102]": {
                     "$type": "EditorLockComponent",
                     "Id": 3668609610460496102
@@ -513,11 +513,8 @@
                         ],
                         "MaterialSlots": {
                             "Slots": [
+                                {},
                                 {
-                                    "Name": "Material 1"
-                                },
-                                {
-                                    "Name": "Material 2",
                                     "MaterialAsset": {
                                         "assetId": {
                                             "guid": "{00880607-87E1-5178-8C30-37B3220D6149}",
@@ -527,7 +524,6 @@
                                     }
                                 },
                                 {
-                                    "Name": "Material 3",
                                     "MaterialAsset": {
                                         "assetId": {
                                             "guid": "{418485F0-20D0-5819-BC6D-22E89145B6AA}",
@@ -561,10 +557,6 @@
                         "Entity_[949682310020]"
                     ]
                 },
-                "Component_[2701087696133365661]": {
-                    "$type": "SelectionComponent",
-                    "Id": 2701087696133365661
-                },
                 "Component_[2925086111632418607]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 2925086111632418607
@@ -704,10 +696,6 @@
                     "$type": "EditorEntitySortComponent",
                     "Id": 14391335833174673744
                 },
-                "Component_[16353146163619112907]": {
-                    "$type": "SelectionComponent",
-                    "Id": 16353146163619112907
-                },
                 "Component_[4146850309854912578]": {
                     "$type": "EditorVisibilityComponent",
                     "Id": 4146850309854912578
@@ -715,6 +703,9 @@
                 "Component_[6089676015797773678]": {
                     "$type": "EditorImageGradientComponent",
                     "Id": 6089676015797773678,
+                    "Previewer": {
+                        "BoundsEntity": ""
+                    },
                     "Configuration": {
                         "StreamingImageAsset": {
                             "assetId": {
@@ -723,8 +714,7 @@
                             },
                             "assetHint": "imagegradients/largeworldsexamples/blured_circle_gsi.tif.streamingimage"
                         }
-                    },
-                    "PreviewEntity": "Entity_[726344010628]"
+                    }
                 },
                 "Component_[6513054201869143058]": {
                     "$type": "EditorLockComponent",
@@ -780,7 +770,9 @@
                         "ShapeEntityId": "Entity_[876667865988]",
                         "FalloffWidth": 0.0
                     },
-                    "PreviewEntity": "Entity_[876667865988]"
+                    "Previewer": {
+                        "BoundsEntity": "Entity_[876667865988]"
+                    }
                 },
                 "Component_[11471394824284544663]": {
                     "$type": "EditorInspectorComponent",
@@ -822,10 +814,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 3045452491462684049
                 },
-                "Component_[6326641414874562178]": {
-                    "$type": "SelectionComponent",
-                    "Id": 6326641414874562178
-                },
                 "Component_[6534397926297186697]": {
                     "$type": "EditorBoxShapeComponent",
                     "Id": 6534397926297186697,
@@ -856,7 +844,9 @@
                         "ShapeEntityId": "Entity_[949682310020]",
                         "FalloffWidth": 0.0
                     },
-                    "PreviewEntity": "Entity_[949682310020]"
+                    "Previewer": {
+                        "BoundsEntity": "Entity_[949682310020]"
+                    }
                 },
                 "Component_[11471394824284544663]": {
                     "$type": "EditorInspectorComponent",
@@ -898,10 +888,6 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 3045452491462684049
                 },
-                "Component_[6326641414874562178]": {
-                    "$type": "SelectionComponent",
-                    "Id": 6326641414874562178
-                },
                 "Component_[6534397926297186697]": {
                     "$type": "EditorBoxShapeComponent",
                     "Id": 6534397926297186697,
@@ -987,12 +973,17 @@
                         "entityId": "",
                         "Compute Mass": false,
                         "Mass": 999.9999389648438,
-                        "Inertia tensor": {
-                            "roll": 0.0,
-                            "pitch": 0.0,
-                            "yaw": 0.0,
-                            "scale": 0.0060000005178153515
-                        }
+                        "Inertia tensor": [
+                            166.66665649414063,
+                            0.0,
+                            0.0,
+                            0.0,
+                            166.66665649414063,
+                            0.0,
+                            0.0,
+                            0.0,
+                            166.66665649414063
+                        ]
                     }
                 },
                 "Component_[15496502846084008866]": {
@@ -1003,10 +994,6 @@
                     "$type": "EditorEntitySortComponent",
                     "Id": 18392511014948595626
                 },
-                "Component_[3579014362228884389]": {
-                    "$type": "SelectionComponent",
-                    "Id": 3579014362228884389
-                },
                 "Component_[3668609610460496102]": {
                     "$type": "EditorLockComponent",
                     "Id": 3668609610460496102