Fix delete gateways API tests

Author: r4victor

src/tests/_internal/server/routers/test_gateways.py

@@ -1,15 +1,13 @@
-from unittest.mock import Mock, patch
+from unittest.mock import patch
 
 import pytest
 from httpx import AsyncClient
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from dstack._internal.core.errors import DstackError
 from dstack._internal.core.models.backends.base import BackendType
 from dstack._internal.core.models.users import GlobalRole, ProjectRole
 from dstack._internal.server.services.projects import add_project_member
 from dstack._internal.server.testing.common import (
-    ComputeMockSpec,
     clear_events,
     create_backend,
     create_gateway,
@@ -457,7 +455,9 @@ async def test_only_admin_can_delete(
 
     @pytest.mark.asyncio
     @pytest.mark.parametrize("test_db", ["sqlite", "postgres"], indirect=True)
-    async def test_delete_gateway(self, test_db, session: AsyncSession, client: AsyncClient):
+    async def test_marks_gateways_to_be_deleted(
+        self, test_db, session: AsyncSession, client: AsyncClient
+    ):
         user = await create_user(session, global_role=GlobalRole.USER)
         project = await create_project(session)
         await add_project_member(
@@ -487,68 +487,36 @@ async def test_delete_gateway(self, test_db, session: AsyncSession, client: Asyn
             name="gateway-gcp",
             gateway_compute_id=gateway_compute_gcp.id,
         )
-        with patch(
-            "dstack._internal.server.services.gateways.get_project_backend_by_type_or_error"
-        ) as m:
-            aws = Mock()
-            aws.compute.return_value = Mock(spec=ComputeMockSpec)
-            aws.compute.return_value.terminate_gateway.return_value = None  # success
-            gcp = Mock()
-            gcp.compute.return_value = Mock(spec=ComputeMockSpec)
-            gcp.compute.return_value.terminate_gateway.side_effect = DstackError()  # fail
-
-            def get_backend(project, backend_type):
-                return {BackendType.AWS: aws, BackendType.GCP: gcp}[backend_type]
-
-            m.side_effect = get_backend
+        response = await client.post(
+            f"/api/project/{project.name}/gateways/delete",
+            json={"names": [gateway_aws.name, gateway_gcp.name]},
+            headers=get_auth_headers(user.token),
+        )
+        assert response.status_code == 200
 
-            response = await client.post(
-                f"/api/project/{project.name}/gateways/delete",
-                json={"names": [gateway_aws.name, gateway_gcp.name]},
-                headers=get_auth_headers(user.token),
-            )
-            aws.compute.return_value.terminate_gateway.assert_called_once()
-            gcp.compute.return_value.terminate_gateway.assert_called_once()
-            assert response.status_code == 200
+        await session.refresh(gateway_aws)
+        await session.refresh(gateway_gcp)
+        await session.refresh(gateway_compute_aws)
+        await session.refresh(gateway_compute_gcp)
+        assert gateway_aws.to_be_deleted is True
+        assert gateway_gcp.to_be_deleted is True
+        assert gateway_compute_aws.active is True
+        assert gateway_compute_aws.deleted is False
+        assert gateway_compute_gcp.active is True
+        assert gateway_compute_gcp.deleted is False
 
         response = await client.post(
             f"/api/project/{project.name}/gateways/list",
             headers=get_auth_headers(user.token),
         )
         assert response.status_code == 200
-        assert response.json() == [
-            {
-                "id": str(gateway_gcp.id),
-                "backend": backend_gcp.type.value,
-                "created_at": response.json()[0]["created_at"],
-                "default": False,
-                "status": "submitted",
-                "status_message": None,
-                "instance_id": gateway_compute_gcp.instance_id,
-                "ip_address": gateway_compute_gcp.ip_address,
-                "hostname": gateway_compute_gcp.ip_address,
-                "name": gateway_gcp.name,
-                "region": gateway_gcp.region,
-                "wildcard_domain": gateway_gcp.wildcard_domain,
-                "configuration": {
-                    "type": "gateway",
-                    "name": gateway_gcp.name,
-                    "backend": backend_gcp.type.value,
-                    "region": gateway_gcp.region,
-                    "instance_type": None,
-                    "router": None,
-                    "domain": gateway_gcp.wildcard_domain,
-                    "default": False,
-                    "public_ip": True,
-                    "certificate": {"type": "lets-encrypt"},
-                    "tags": None,
-                },
-            }
-        ]
+        assert {g["name"] for g in response.json()} == {"gateway-aws", "gateway-gcp"}
+
         events = await list_events(session)
-        assert len(events) == 1
-        assert events[0].message == "Gateway deleted"
-        assert events[0].targets[0].entity_name == "gateway-aws"
+        assert len(events) == 2
+        assert all(e.message == "Gateway marked for deletion" for e in events)
+        assert {e.targets[0].entity_name for e in events} == {"gateway-aws", "gateway-gcp"}
+        assert all(e.actor_user_id == user.id for e in events)
 
 
 class TestUpdateGateway: