Skip to content
This repository has been archived by the owner on Oct 31, 2023. It is now read-only.

Fix graceful shutdown #4669

Merged
merged 1 commit into from
Sep 2, 2019
Merged

Fix graceful shutdown #4669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion golem/node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ def _is_task_in_progress(self) -> bool:
logger.debug('_is_task_in_progress? False: task_computer=None')
return False

task_provider_progress = task_server.task_computer.assigned_subtask
task_provider_progress = task_server.task_computer.has_assigned_task()
logger.debug('_is_task_in_progress? provider=%r, requestor=False',
task_provider_progress)
return bool(task_provider_progress)
Expand Down
4 changes: 2 additions & 2 deletions tests/golem/test_opt_node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -898,7 +898,7 @@ def test__is_task_in_progress_no_shutdown(self, *_):
self.node.client.task_server.task_computer = mock_tc

mock_tm.get_progresses = Mock(return_value={})
mock_tc.assigned_subtask = None
mock_tc.has_assigned_task = Mock(return_value=False)

result = self.node._is_task_in_progress()

Expand Down Expand Up @@ -933,7 +933,7 @@ def test__is_task_in_progress_quit(self, *_):
self.node.client.task_server.task_computer = mock_tc

mock_tm.get_progresses = Mock(return_value={'a': 'a'})
mock_tc.assigned_subtask = {'a': 'a'}
mock_tc.has_assigned_task = Mock(return_value=True)

result = self.node._is_task_in_progress()

Expand Down