Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions devservices/utils/supervisor.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,24 +153,24 @@ def stop_supervisor_daemon(self) -> None:
except xmlrpc.client.Fault as e:
raise SupervisorError(f"Failed to stop supervisor: {e.faultString}")

def start_program(self, program_name: str) -> None:
if self._is_program_running(program_name):
def start_process(self, name: str) -> None:
if self._is_program_running(name):
return
try:
self._get_rpc_client().supervisor.startProcess(program_name)
self._get_rpc_client().supervisor.startProcess(name)
except xmlrpc.client.Fault as e:
raise SupervisorProcessError(
f"Failed to start program {program_name}: {e.faultString}"
f"Failed to start process {name}: {e.faultString}"
)

def stop_program(self, program_name: str) -> None:
if not self._is_program_running(program_name):
def stop_process(self, name: str) -> None:
if not self._is_program_running(name):
return
try:
self._get_rpc_client().supervisor.stopProcess(program_name)
self._get_rpc_client().supervisor.stopProcess(name)
except xmlrpc.client.Fault as e:
raise SupervisorProcessError(
f"Failed to stop program {program_name}: {e.faultString}"
f"Failed to stop process {name}: {e.faultString}"
)

def get_program_command(self, program_name: str) -> str:
Expand Down
24 changes: 12 additions & 12 deletions tests/utils/test_supervisor.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,20 +205,20 @@ def test_stop_supervisor_daemon_failure(


@mock.patch("devservices.utils.supervisor.xmlrpc.client.ServerProxy")
def test_start_program_success(
def test_start_process_success(
mock_rpc_client: mock.MagicMock, supervisor_manager: SupervisorManager
) -> None:
mock_rpc_client.return_value.supervisor.getProcessInfo.return_value = {
"state": SupervisorProcessState.STOPPED
}
supervisor_manager.start_program("test_program")
supervisor_manager.start_process("test_program")
supervisor_manager._get_rpc_client().supervisor.startProcess.assert_called_once_with(
"test_program"
)


@mock.patch("devservices.utils.supervisor.xmlrpc.client.ServerProxy")
def test_start_program_failure(
def test_start_process_failure(
mock_rpc_client: mock.MagicMock, supervisor_manager: SupervisorManager
) -> None:
mock_rpc_client.return_value.supervisor.getProcessInfo.return_value = {
Expand All @@ -228,35 +228,35 @@ def test_start_program_failure(
xmlrpc.client.Fault(1, "Error")
)
with pytest.raises(SupervisorProcessError):
supervisor_manager.start_program("test_program")
supervisor_manager.start_process("test_program")


@mock.patch("devservices.utils.supervisor.xmlrpc.client.ServerProxy")
def test_start_program_already_running(
def test_start_process_already_running(
mock_rpc_client: mock.MagicMock, supervisor_manager: SupervisorManager
) -> None:
mock_rpc_client.return_value.supervisor.getProcessInfo.return_value = {
"state": SupervisorProcessState.RUNNING
}
supervisor_manager.start_program("test_program")
supervisor_manager.start_process("test_program")
mock_rpc_client.supervisor.startProcess.assert_not_called()


@mock.patch("devservices.utils.supervisor.xmlrpc.client.ServerProxy")
def test_stop_program_success(
def test_stop_process_success(
mock_rpc_client: mock.MagicMock, supervisor_manager: SupervisorManager
) -> None:
mock_rpc_client.return_value.supervisor.getProcessInfo.return_value = {
"state": SupervisorProcessState.RUNNING
}
supervisor_manager.stop_program("test_program")
supervisor_manager.stop_process("test_program")
supervisor_manager._get_rpc_client().supervisor.stopProcess.assert_called_once_with(
"test_program"
)


@mock.patch("devservices.utils.supervisor.xmlrpc.client.ServerProxy")
def test_stop_program_failure(
def test_stop_process_failure(
mock_rpc_client: mock.MagicMock, supervisor_manager: SupervisorManager
) -> None:
mock_rpc_client.return_value.supervisor.getProcessInfo.return_value = {
Expand All @@ -266,17 +266,17 @@ def test_stop_program_failure(
xmlrpc.client.Fault(1, "Error")
)
with pytest.raises(SupervisorProcessError):
supervisor_manager.stop_program("test_program")
supervisor_manager.stop_process("test_program")


@mock.patch("devservices.utils.supervisor.xmlrpc.client.ServerProxy")
def test_stop_program_not_running(
def test_stop_process_not_running(
mock_rpc_client: mock.MagicMock, supervisor_manager: SupervisorManager
) -> None:
mock_rpc_client.return_value.supervisor.getProcessInfo.return_value = {
"state": SupervisorProcessState.STOPPED
}
supervisor_manager.stop_program("test_program")
supervisor_manager.stop_process("test_program")
mock_rpc_client.supervisor.stopProcess.assert_not_called()


Expand Down
Loading