tests: fix the rest of Worker.update_worker related tests

Related: #68
release-engineering · Aug 23, 2023 · b7bc9d6 · b7bc9d6
1 parent d83474b
commit b7bc9d6
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 5 deletions.
diff --git a/tests/test_taskmanager.py b/tests/test_taskmanager.py
@@ -131,18 +131,39 @@ def setUp(self):
         self._user = user
         self._worker = RpcServiceMock(w)
 
-    @pytest.mark.xfail(reason='Check issue #68 for more info (https://git.io/fxSZ2).')
     @patch('kobo.worker.taskmanager.HubProxy', HubProxyMock)
     def test_update_worker_info(self):
         tm = TaskManager(conf={'worker': self._worker})
         self.assertTrue(tm.worker_info['enabled'])
         self.assertTrue(tm.worker_info['ready'])
+        self.assertEqual(tm.worker_info['task_count'], 0)
 
         tm.worker_info['enabled'] = False
         tm.worker_info['ready'] = False
         tm.update_worker_info()
-        self.assertFalse(tm.worker_info['enabled'])
+
+        # no open tasks, info won't be updated
+        self.assertTrue(tm.worker_info['enabled'])
+        self.assertTrue(tm.worker_info['ready'])
+        self.assertEqual(tm.worker_info['task_count'], 0)
+
+        Task.objects.create(
+            worker=self._worker.worker,
+            arch=self._arch,
+            channel=self._channel,
+            owner=self._user,
+            method='DummyForkTask',
+            state=TASK_STATES['OPEN'],
+        )
+
+        tm.worker_info['enabled'] = False
+        tm.worker_info['ready'] = False
+        tm.update_worker_info()
+
+        # open task, info will be updated
+        self.assertTrue(tm.worker_info['enabled'])
         self.assertFalse(tm.worker_info['ready'])
+        self.assertEqual(tm.worker_info['task_count'], 1)
 
     @patch('kobo.worker.taskmanager.HubProxy', HubProxyMock)
     def test_update_worker_info_catch_protocol_error(self):

diff --git a/tests/test_xmlrpc_worker.py b/tests/test_xmlrpc_worker.py
@@ -717,17 +717,32 @@ def test_set_task_weight_fails_if_another_worker_task(self):
         t = Task.objects.get(id=t.id)
         self.assertEqual(t.weight, 1)
 
-    @pytest.mark.xfail(reason='Check issue #68 for more info (https://git.io/fxSZ2).')
     def test_update_worker(self):
         req = _make_request(self._worker)
 
         self.assertTrue(self._worker.enabled)
         self.assertTrue(self._worker.ready)
         self.assertEqual(self._worker.task_count, 0)
 
-        wi = worker.update_worker(req, False, False, 1)
+        # no open tasks, info won't be updated
+        wi = worker.update_worker(req, True, False, 1)
 
-        self.assertFalse(wi['enabled'])
+        self.assertTrue(wi['enabled'])
+        self.assertTrue(wi['ready'])
+        self.assertEqual(wi['task_count'], 0)
+
+        Task.objects.create(
+            worker=self._worker,
+            arch=self._arch,
+            channel=self._channel,
+            owner=self._user,
+            state=TASK_STATES['OPEN'],
+        )
+
+        wi = worker.update_worker(req, True, False, 1)
+
+        # open task, info will be updated
+        self.assertTrue(wi['enabled'])
         self.assertFalse(wi['ready'])
         self.assertEqual(wi['task_count'], 1)