Merge pull request #4669 from golemfactory/fix_graceful_shutdown

Fix graceful shutdown
golemfactory · Sep 2, 2019 · 32b224b · 32b224b
2 parents 3059a00 + e2abdfa
commit 32b224b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/golem/node.py b/golem/node.py
@@ -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)

diff --git a/tests/golem/test_opt_node.py b/tests/golem/test_opt_node.py
@@ -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()
 
@@ -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()