Update test for deleting resource

simonrw · simonrw · commit 67d8ad80e02a · 2025-04-15T20:57:22.000+01:00
diff --git a/tests/aws/services/cloudformation/api/test_changesets.py b/tests/aws/services/cloudformation/api/test_changesets.py
@@ -104,11 +104,18 @@ def test_simple_update_two_resources(
 
         res.destroy()
 
-    @markers.aws.needs_fixing
-    def test_deleting_resource(self, aws_client: ServiceLevelClientFactory, deploy_cfn_template):
+    @markers.aws.validated
+    # TODO: the error response is incorrect, however the test is otherwise validated and raises
+    #  an error because the SSM parameter has been deleted (removed from the stack).
+    @markers.snapshot.skip_snapshot_verify(paths=["$..Error.Message", "$..message"])
+    @pytest.mark.skipif(
+        condition=not is_v2_engine() and not is_aws_cloud(), reason="Test fails with the old engine"
+    )
+    def test_deleting_resource(
+        self, aws_client: ServiceLevelClientFactory, deploy_cfn_template, snapshot
+    ):
         parameter_name = "my-parameter"
         value1 = "foo"
-        stack_name = f"stack-{short_uid()}"
 
         t1 = {
             "Resources": {
@@ -130,20 +137,18 @@ def test_deleting_resource(self, aws_client: ServiceLevelClientFactory, deploy_c
             },
         }
 
-        res = deploy_cfn_template(stack_name=stack_name, template=json.dumps(t1), is_update=False)
+        stack = deploy_cfn_template(template=json.dumps(t1))
         found_value = aws_client.ssm.get_parameter(Name=parameter_name)["Parameter"]["Value"]
         assert found_value == value1
 
         t2 = copy.deepcopy(t1)
         del t2["Resources"]["MyParameter2"]
 
-        deploy_cfn_template(stack_name=stack_name, template=json.dumps(t2), is_update=True)
+        deploy_cfn_template(stack_name=stack.stack_name, template=json.dumps(t2), is_update=True)
         with pytest.raises(ClientError) as exc_info:
-            aws_client.ssm.get_parameter(Name=parameter_name)["Parameter"]["Value"]
+            aws_client.ssm.get_parameter(Name=parameter_name)
 
-        assert f"Parameter {parameter_name} not found" in str(exc_info.value)
-
-        res.destroy()
+        snapshot.match("get-parameter-error", exc_info.value.response)
 
 
 @markers.aws.validated
diff --git a/tests/aws/services/cloudformation/api/test_changesets.snapshot.json b/tests/aws/services/cloudformation/api/test_changesets.snapshot.json
@@ -7268,5 +7268,20 @@
       "before-value": "<name-1>",
       "after-value": "<name-2>"
     }
+  },
+  "tests/aws/services/cloudformation/api/test_changesets.py::TestUpdates::test_deleting_resource": {
+    "recorded-date": "15-04-2025, 15:07:18",
+    "recorded-content": {
+      "get-parameter-error": {
+        "Error": {
+          "Code": "ParameterNotFound",
+          "Message": ""
+        },
+        "ResponseMetadata": {
+          "HTTPHeaders": {},
+          "HTTPStatusCode": 400
+        }
+      }
+    }
   }
 }
diff --git a/tests/aws/services/cloudformation/api/test_changesets.validation.json b/tests/aws/services/cloudformation/api/test_changesets.validation.json
@@ -41,6 +41,9 @@
   "tests/aws/services/cloudformation/api/test_changesets.py::TestCaptureUpdateProcess::test_unrelated_changes_update_propagation": {
     "last_validated_date": "2025-04-01T16:40:03+00:00"
   },
+  "tests/aws/services/cloudformation/api/test_changesets.py::TestUpdates::test_deleting_resource": {
+    "last_validated_date": "2025-04-15T15:07:18+00:00"
+  },
   "tests/aws/services/cloudformation/api/test_changesets.py::TestUpdates::test_simple_update_two_resources": {
     "last_validated_date": "2025-04-02T10:05:26+00:00"
   },
