linter

golem/task/taskserver.py

@@ -269,7 +269,10 @@ def resume(self):
         super().resume()
         CoreTask.VERIFICATION_QUEUE.resume()
 
-    def get_environment_by_id(self, env_id: str) -> Union[OldEnv, NewEnv]:
+    def get_environment_by_id(
+            self,
+            env_id: str
+    ) -> Optional[Union[OldEnv, NewEnv]]:
         """ Looks for the requested env_id in the new, then the old env_manager.
             Returns None when the environment is not found. """
         keeper = self.task_keeper
@@ -293,16 +296,16 @@ def _request_random_task(self):
 
         if time.time() - self._last_task_request_time \
                 < self.config_desc.task_request_interval:
-            return None
+            return
 
         if self.task_computer.has_assigned_task() \
                 or (not self.task_computer.compute_tasks) \
                 or (not self.task_computer.runnable):
-            return None
+            return
 
         task_header = self.task_keeper.get_task(self.requested_tasks)
         if task_header is None:
-            return None
+            return
 
         self._last_task_request_time = time.time()
         self.task_computer.stats.increase_stat('tasks_requested')

tests/golem/task/test_envmanager.py

@@ -90,7 +90,7 @@ def test_payload_builder(self):
         self.assertEqual(pb, self.manager.payload_builder("env1"))
 
 
-class TestEnvironmentManagerDB(
+class TestEnvironmentManagerDB(  # pylint: disable=too-many-ancestors
         EnvManagerBaseTest,
         DatabaseFixture,
         TwistedTestCase

tests/golem/task/test_taskserver.py

@@ -1413,7 +1413,8 @@ def test_get_environment_by_id_not_found(self):
     @defer.inlineCallbacks
     def test_request_task(self):
         # Given
-        task_header = get_example_task_header("abc")
+
+        task_header = get_example_task_header('abc')
 
         self.ts.should_accept_requestor = Mock(return_value=SupportStatus.ok())
         self.ts.client.concent_service.enabled = False
@@ -1427,7 +1428,9 @@ def test_request_task(self):
 
         mock_handshake = Mock()
         mock_handshake.success = Mock(return_value=True)
-        self.ts.resource_handshakes[task_header.task_owner.key] = mock_handshake
+        self.ts.resource_handshakes[
+            task_header.task_owner.key  # pylint: disable=no-member
+        ] = mock_handshake
 
         # When
         yield self.ts._request_task(task_header)
@@ -1439,7 +1442,7 @@ def test_request_task(self):
     def test_request_task_running_benchmark(self):
         # Given
         performance = None
-        task_header = get_example_task_header("abc")
+        task_header = get_example_task_header('abc')
 
         self.ts.should_accept_requestor = Mock(return_value=SupportStatus.ok())
         self.ts.client.concent_service.enabled = False
@@ -1453,7 +1456,9 @@ def test_request_task_running_benchmark(self):
 
         mock_handshake = Mock()
         mock_handshake.success = Mock(return_value=True)
-        self.ts.resource_handshakes[task_header.task_owner.key] = mock_handshake
+        self.ts.resource_handshakes[
+            task_header.task_owner.key  # pylint: disable=no-member
+        ] = mock_handshake
 
         # When
         result = yield self.ts._request_task(task_header)