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
@@ -308,9 +308,11 @@ class TestAndroidLauncher:
def test_Kill_HappyPath_KillCommandSuccess(self, mock_config, mock_call):
mock_config.return_value = VALID_ANDROID_CONFIG
mock_workspace = MockedWorkspace()
launcher = ly_test_tools.launchers.AndroidLauncher(mock_workspace, ["dummy"])
launcher.kill()
# This is a direct call to a protected method, but the point of the test is to ensure functionality of this
# protected method, so we will allow this exception
launcher._kill()
mock_call.assert_called_once_with(
['adb', '-s', VALID_ANDROID_CONFIG['android']['id'], 'shell', 'am', 'force-stop', PACKAGE_NAME])
@@ -52,7 +52,7 @@ class TestBaseLauncher:
def test_Kill_Unimplemented_NotImplementedError(self):
launcher = self.test_Construct_TestDoubles_BaseLauncherCreated()
with pytest.raises(NotImplementedError):
launcher.kill()
launcher.stop()
def test_Launch_Unimplemented_NotImplementedError(self):
launcher = self.test_Construct_TestDoubles_BaseLauncherCreated()
@@ -111,7 +111,7 @@ class TestBaseLauncher:
with pytest.raises(NotImplementedError):
launcher.stop()
@mock.patch('ly_test_tools.launchers.platforms.base.Launcher.kill')
@mock.patch('ly_test_tools.launchers.platforms.base.Launcher._kill')
@mock.patch('ly_test_tools.launchers.platforms.base.Launcher.ensure_stopped')
@mock.patch('ly_test_tools.launchers.platforms.base.Launcher.teardown')
def test_Stop_MockImplementedLauncher_KillTeardown(self, mock_teardown, mock_ensure, mock_kill):
@@ -57,7 +57,7 @@ class TestLinuxLauncher(object):
launcher = ly_test_tools.launchers.LinuxLauncher(mock.MagicMock(), ["dummy"])
launcher._proc = mock_proc
launcher.kill()
launcher.stop()
mock_proc.kill.assert_called_once()
mock_alive.assert_called_once()
mock_alive.assert_called()
@@ -62,7 +62,7 @@ class TestMacLauncher(object):
launcher = ly_test_tools.launchers.MacLauncher(mock.MagicMock(), ["dummy"])
launcher._proc = mock_proc
launcher.kill()
launcher.stop()
mock_proc.kill.assert_called_once()
mock_alive.assert_called_once()
mock_alive.assert_called()
@@ -56,10 +56,10 @@ class TestWinLauncher(object):
launcher = ly_test_tools.launchers.WinLauncher(mock.MagicMock(), ["dummy"])
launcher._proc = mock_proc
launcher.kill()
launcher.stop()
mock_proc.kill.assert_called_once()
mock_alive.assert_called_once()
mock_alive.assert_called()
def test_IsAlive_NoProc_False(self):
launcher = ly_test_tools.launchers.WinLauncher(mock.MagicMock(), ["dummy"])
@@ -694,7 +694,7 @@ class TestRunningTests(unittest.TestCase):
'mock_log_name', mock_test_spec, [])
assert mock_cycle_crash.called
assert mock_editor.start.called
assert mock_editor.kill.called
assert mock_editor.stop.called
assert mock_create.called
assert results == {mock_test_spec.__name__: mock_timeout}