Merge branch 'main' of https://github.com/aws-lumberyard/o3de into ly-as-sdk/LYN-2948-phistere

2021-05-25 23:48:55 -05:00
parent 80f9da800a 29163fba1a
commit 76fe7f3666
1623 changed files with 54998 additions and 47910 deletions
@@ -224,7 +224,7 @@ void RCcontrollerTest_Simple::SubmitJob()

 // This is a regresssion test to ensure the rccontroller can handle multiple jobs for the same file being completed before
 // the APM has a chance to send OnFinishedProcesssingJob events
-TEST_F(RCcontrollerTest_Simple, SameJobIsCompletedMultipleTimes_CompletesWithoutError)
+TEST_F(RCcontrollerTest_Simple, DISABLED_SameJobIsCompletedMultipleTimes_CompletesWithoutError)
 {
    using namespace AssetProcessor;