Merge pull request #4430 from aws-lumberyard-dev/Atom/jromnoa/fix-for-vulkan-rhi-test-failure

Fix Vulkan RHI test failure by increasing timeout

AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU.py

@@ -226,9 +226,9 @@ class TestMaterialEditor(object):
             self, request, workspace, project, launcher_platform, generic_launcher, exe_file_name, cfg_args):
         """
         Tests each valid RHI option (Null RHI excluded) can be launched with the MaterialEditor.
-        Checks for the "Finished loading viewport configurtions." success message post lounch.
+        Checks for the "Finished loading viewport configurations." success message post launch.
         """
-        expected_lines = ["Finished loading viewport configurtions."]
+        expected_lines = ["Finished loading viewport configurations."]
         unexpected_lines = [
             # "Trace::Assert",
             # "Trace::Error",
@@ -241,7 +241,7 @@ class TestMaterialEditor(object):
             generic_launcher,
             editor_script="",
             run_python="--runpython",
-            timeout=30,
+            timeout=60,
             expected_lines=expected_lines,
             unexpected_lines=unexpected_lines,
             halt_on_unexpected=False,

Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp

@@ -190,7 +190,7 @@ namespace MaterialEditor
 
     void MaterialViewportComponent::ReloadContent()
     {
-        AZ_TracePrintf("Material Editor", "Started loading viewport configurtions.\n");
+        AZ_TracePrintf("Material Editor", "Started loading viewport configurations.\n");
 
         MaterialViewportNotificationBus::Broadcast(&MaterialViewportNotificationBus::Events::OnBeginReloadContent);
 
@@ -239,7 +239,7 @@ namespace MaterialEditor
                     {
                         auto presetPtr = AddLightingPreset(*preset);
                         m_lightingPresetLastSavePathMap[presetPtr] = AZ::RPI::AssetUtils::GetSourcePathByAssetId(info.m_assetId);
-                        AZ_TracePrintf("Material Editor", "Loaded viewport configurtion: %s.\n", info.m_relativePath.c_str());
+                        AZ_TracePrintf("Material Editor", "Loaded viewport configuration: %s.\n", info.m_relativePath.c_str());
                     }
                 }
             }
@@ -258,7 +258,7 @@ namespace MaterialEditor
                     {
                         auto presetPtr = AddModelPreset(*preset);
                         m_modelPresetLastSavePathMap[presetPtr] = AZ::RPI::AssetUtils::GetSourcePathByAssetId(info.m_assetId);
-                        AZ_TracePrintf("Material Editor", "Loaded viewport configurtion: %s.\n", info.m_relativePath.c_str());
+                        AZ_TracePrintf("Material Editor", "Loaded viewport configuration: %s.\n", info.m_relativePath.c_str());
                     }
                 }
             }
@@ -271,7 +271,7 @@ namespace MaterialEditor
 
         MaterialViewportNotificationBus::Broadcast(&MaterialViewportNotificationBus::Events::OnEndReloadContent);
 
-        AZ_TracePrintf("Material Editor", "Finished loading viewport configurtions.\n");
+        AZ_TracePrintf("Material Editor", "Finished loading viewport configurations.\n");
     }
 
     AZ::Render::LightingPresetPtr MaterialViewportComponent::AddLightingPreset(const AZ::Render::LightingPreset& preset)