Misc cleanup. Making sure ServerLauncher closes if tests fail

Signed-off-by: Gene Walters <genewalt@amazon.com>

AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/utils.py

@@ -110,14 +110,12 @@ class TestHelper:
             # make sure the server launcher is running
             waiter.wait_for(lambda: process_utils.process_exists("AutomatedTesting.ServerLauncher", ignore_extensions=True), timeout=5.0, exc=AssertionError("AutomatedTesting.ServerLauncher has NOT launched!"), interval=1.0)
 
-            wait_for_critical_expected_line("(EditorServer) - MultiplayerEditorConnection: Editor-server activation has found and connected to the editor...", section_tracer.prints, 15.0)
+            wait_for_critical_expected_line("MultiplayerEditorConnection: Editor-server activation has found and connected to the editor.", section_tracer.prints, 15.0)
 
-            # make sure the editor connects to the editor-server and sends the level data packet
             wait_for_critical_expected_line("Editor is sending the editor-server the level data packet.", section_tracer.prints, 5.0)
 
-            wait_for_critical_expected_line("(EditorServer) - MultiplayerEditorConnection: Editor Server completed receiving the editor's level assets, responding to Editor...", section_tracer.prints, 5.0)
+            wait_for_critical_expected_line("MultiplayerEditorConnection: Editor Server completed receiving the editor's level assets, responding to Editor...", section_tracer.prints, 5.0)
 
-            # make sure the editor finally connects to the editor-server network simulation
             wait_for_critical_expected_line("Editor-server ready. Editor has successfully connected to the editor-server's network simulation.", section_tracer.prints, 5.0)
 
         TestHelper.wait_for_condition(lambda : multiplayer.PythonEditorFuncs_is_in_game_mode(), 5.0)

AutomatedTesting/Gem/PythonTests/automatedtesting_shared/base.py

@@ -177,7 +177,7 @@ class TestAutomationBase:
     @staticmethod
     def _kill_ly_processes(include_asset_processor=True):
         LY_PROCESSES = [
-            'Editor', 'Profiler', 'RemoteConsole',
+            'Editor', 'Profiler', 'RemoteConsole', 'AutomatedTesting.ServerLauncher'
         ]
         AP_PROCESSES = [
             'AssetProcessor', 'AssetProcessorBatch', 'AssetBuilder', 'CrySCompileServer',

Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp

@@ -6,7 +6,6 @@
  *
  */
 
-#include "AzFramework/Process/ProcessCommunicator.h"
 
 #include <Multiplayer/IMultiplayer.h>
 #include <Multiplayer/IMultiplayerTools.h>
@@ -16,11 +15,8 @@
 #include <MultiplayerSystemComponent.h>
 #include <PythonEditorEventsBus.h>
 #include <Editor/MultiplayerEditorSystemComponent.h>
-#include <Source/AutoGen/Multiplayer.AutoPackets.h>
 
-#include <AzCore/Component/ComponentApplicationBus.h>
 #include <AzCore/Console/IConsole.h>
-#include <AzCore/Console/ILogger.h>
 #include <AzCore/Interface/Interface.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Utils/Utils.h>