[tests] Strengthened concurrent-guard test and added WebSocket push-path coverage for pending #423

- The mixed-success+pending concurrent-guard subtest now drives UpgradeOperation.upgrade() directly (with DeviceConnection.get_working_connection mocked to bypass the network) and asserts the new op transitions to status="aborted" with the expected log line, rather than only verifying the queryset filter
- New test_pending_transition_publishes_batch_status_with_pending_count covers the push path: it connects a BatchUpgradeProgressConsumer, transitions a child op to pending via save, and asserts the post_save -> BatchUpgradeProgressPublisher.update_batch_status -> publish_batch_status chain emits a batch_status payload with pending=1, completed=0 and the batch staying at in-progress

Related to #423

Author: Eeshu-Yadav

openwisp_firmware_upgrader/tests/test_models.py

@@ -878,15 +878,17 @@ def test_batch_with_mixed_success_and_pending_children(self):
                 batch=batch,
                 status="in-progress",
             )
-            blocking = (
-                UpgradeOperation.objects.filter(
-                    device=device_fw.device,
-                    status__in=("in-progress", "pending"),
-                )
-                .exclude(pk=new_op.pk)
-                .values_list("pk", flat=True)
-            )
-            self.assertIn(still_pending.pk, list(blocking))
+            with mock.patch(
+                "openwisp_controller.connection.models.DeviceConnection."
+                "get_working_connection",
+                return_value=mock.MagicMock(),
+            ):
+                new_op.upgrade()
+            new_op.refresh_from_db()
+            self.assertEqual(new_op.status, "aborted")
+            self.assertIn("Another upgrade operation is in progress", new_op.log)
+            still_pending.refresh_from_db()
+            self.assertEqual(still_pending.status, "pending")
 
     def test_pending_count_property(self):
         device_fw = self._create_device_firmware()

openwisp_firmware_upgrader/tests/test_websockets.py

@@ -748,3 +748,40 @@ async def test_device_consumer_snapshot_includes_pending(self, *args):
         self.assertEqual(response["type"], "operation_update")
         self.assertEqual(response["operation"]["status"], "pending")
         await communicator.disconnect()
+
+    @patch(_mock_upgrade, return_value=True)
+    @patch(_mock_connect, return_value=True)
+    async def test_pending_transition_publishes_batch_status_with_pending_count(
+        self, *args
+    ):
+        build = await sync_to_async(self._get_build)()
+        device_fw = await sync_to_async(self._create_device_firmware)()
+        batch = await sync_to_async(BatchUpgradeOperation.objects.create)(
+            build=build, is_persistent=True, status="in-progress"
+        )
+        op = await sync_to_async(UpgradeOperation.objects.create)(
+            device=device_fw.device,
+            image=device_fw.image,
+            batch=batch,
+            status="in-progress",
+            is_persistent=True,
+        )
+        communicator = await self._get_batch_upgrade_progress_communicator(
+            str(batch.pk)
+        )
+        op.status = "pending"
+        await sync_to_async(op.save)()
+        batch_status = None
+        for _ in range(10):
+            response = await asyncio.wait_for(
+                communicator.receive_json_from(), timeout=1
+            )
+            if response.get("type") == "batch_status":
+                batch_status = response
+                break
+        self.assertIsNotNone(batch_status)
+        self.assertEqual(batch_status["status"], "in-progress")
+        self.assertEqual(batch_status["pending"], 1)
+        self.assertEqual(batch_status["completed"], 0)
+        self.assertEqual(batch_status["total"], 1)
+        await communicator.disconnect()