Changed kill() to protected. Changed references from kill() to stop().

Signed-off-by: scspaldi <scspaldi@amazon.com>
This commit is contained in:
scspaldi
2022-01-27 17:06:47 -08:00
parent 5509764fc2
commit 92da291bb4
13 changed files with 24 additions and 22 deletions
@@ -280,7 +280,7 @@ class AndroidLauncher(Launcher):
return True
return False
def kill(self):
def _kill(self):
"""
Attempts to force quit any running processes with the stored package name on the device
that is set to self._device_id via the self._adb_prefix_command
@@ -208,7 +208,7 @@ class Launcher(object):
:return None:
"""
self.kill()
self._kill()
self.ensure_stopped()
self.teardown()
@@ -228,7 +228,7 @@ class Launcher(object):
"""
raise NotImplementedError("Launch is not implemented")
def kill(self):
def _kill(self):
"""
Force stop the launcher.
@@ -274,7 +274,7 @@ class Launcher(object):
timeout=timeout
)
except ly_test_tools.launchers.exceptions.TeardownError:
self.kill()
self._kill()
def get_device_config(self, config_file, device_section, device_key):
"""
@@ -89,7 +89,7 @@ class LinuxLauncher(Launcher):
self.restore_settings()
super(LinuxLauncher, self).teardown()
def kill(self):
def _kill(self):
"""
This is a hard kill, and then wait to make sure until it actually ended.
@@ -44,7 +44,7 @@ class MacLauncher(Launcher):
self._proc = subprocess.Popen(command)
log.debug(f"Started Mac Launcher with command: {command}")
def kill(self):
def _kill(self):
"""
This is a hard kill, and then wait to make sure until it actually ended.
@@ -89,7 +89,7 @@ class WinLauncher(Launcher):
self.restore_settings()
super(WinLauncher, self).teardown()
def kill(self):
def _kill(self):
"""
This is a hard kill, and then wait to make sure until it actually ended.
@@ -789,7 +789,7 @@ class EditorTestSuite():
test_result = Result.Fail.create(test_spec, output, editor_log_content)
except WaitTimeoutError:
output = editor.get_output()
editor.kill()
editor.stop()
editor_log_content = editor_utils.retrieve_editor_log_content(run_id, log_name, workspace)
test_result = Result.Timeout.create(test_spec, output, test_spec.timeout, editor_log_content)
@@ -891,7 +891,7 @@ class EditorTestSuite():
results[test_spec_name] = Result.Crash.create(crashed_result.test_spec, output, return_code,
crash_error, crashed_result.editor_log)
except WaitTimeoutError:
editor.kill()
editor.stop()
output = editor.get_output()
editor_log_content = editor_utils.retrieve_editor_log_content(run_id, log_name, workspace)