bec/bec_widgets
0
0
Fork 0
mirror of https://github.com/bec-project/bec_widgets.git synced 2025-07-14 11:41:49 +02:00
Code Activity

fix(vscode): only run terminate if the process is still alive

Browse Source
This commit is contained in:
wakonig_k
2024-06-25 18:05:27 +02:00
parent acc13183e2
commit 7120f3e93b
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bec_widgets/widgets/vscode/vscode.py
View File

@ -60,7 +60,7 @@ class VSCodeEditor(WebsiteWidget):
""" """
Cleanup the VSCode editor. Cleanup the VSCode editor.
""" """
if not self.process: if not self.process or self.process.poll() is not None:
return return
os.killpg(os.getpgid(self.process.pid), signal.SIGTERM) os.killpg(os.getpgid(self.process.pid), signal.SIGTERM)
self.process.wait() self.process.wait()

29
tests/unit_tests/test_vscode_widget.py
View File

@ -46,7 +46,8 @@ def test_start_server(qtbot, mocked_client):
) )
def test_close_event(qtbot, vscode_widget): @pytest.fixture
def patched_vscode_process(qtbot, vscode_widget):
with mock.patch("bec_widgets.widgets.vscode.vscode.os.killpg") as mock_killpg: with mock.patch("bec_widgets.widgets.vscode.vscode.os.killpg") as mock_killpg:
with mock.patch("bec_widgets.widgets.vscode.vscode.os.getpgid") as mock_getpgid: with mock.patch("bec_widgets.widgets.vscode.vscode.os.getpgid") as mock_getpgid:
with mock.patch( with mock.patch(
@ -54,8 +55,24 @@ def test_close_event(qtbot, vscode_widget):
) as mock_close_event: ) as mock_close_event:
mock_getpgid.return_value = 123 mock_getpgid.return_value = 123
vscode_widget.process = mock.Mock() vscode_widget.process = mock.Mock()
vscode_widget.process.pid = 123 yield vscode_widget, mock_killpg, mock_close_event
vscode_widget.closeEvent(None)
mock_killpg.assert_called_once_with(123, 15)
vscode_widget.process.wait.assert_called_once() def test_close_event(qtbot, patched_vscode_process):
mock_close_event.assert_called_once() vscode_patched, mock_killpg, mock_close_event = patched_vscode_process
vscode_patched.process.pid = 123
vscode_patched.process.poll.return_value = None
vscode_patched.closeEvent(None)
mock_killpg.assert_called_once_with(123, 15)
vscode_patched.process.wait.assert_called_once()
mock_close_event.assert_called_once()
def test_close_event_on_terminated_code(qtbot, patched_vscode_process):
vscode_patched, mock_killpg, mock_close_event = patched_vscode_process
vscode_patched.process.pid = 123
vscode_patched.process.poll.return_value = 0
vscode_patched.closeEvent(None)
mock_killpg.assert_not_called()
vscode_patched.process.wait.assert_not_called()
mock_close_event.assert_called_once()