move and improve test

pinzon · pinzon · commit 6ff9e82487a1 · 2025-10-10T13:05:20.000-05:00
diff --git a/tests/aws/services/cloudformation/api/test_changesets.py b/tests/aws/services/cloudformation/api/test_changesets.py
@@ -1487,3 +1487,40 @@ def test_update_change_set_with_aws_novalue_repro(aws_client, cleanups):
             {"ParameterKey": "FallbackBucketName", "ParameterValue": fallback_bucket},
         ],
     )
+
+
+@markers.aws.validated
+def test_create_changeset_for_deleted_stack(aws_client, deploy_cfn_template, snapshot):
+    template = json.dumps(
+        {
+            "Resources": {
+                "Parameter": {
+                    "Type": "AWS::SSM::Parameter",
+                    "Properties": {"Type": "String", "Value": "Test"},
+                }
+            }
+        }
+    )
+
+    stack = deploy_cfn_template(template=template)
+    stack.destroy()
+
+    with pytest.raises(ClientError) as create_ex:
+        aws_client.cloudformation.create_change_set(
+            StackName=stack.stack_id,
+            ChangeSetName="test",
+            TemplateBody=template,
+            ChangeSetType="CREATE",
+        )
+
+    with pytest.raises(ClientError) as update_ex:
+        aws_client.cloudformation.create_change_set(
+            StackName=stack.stack_id,
+            ChangeSetName="test",
+            TemplateBody=template,
+            ChangeSetType="UPDATE",
+        )
+
+    snapshot.add_transformer(snapshot.transform.regex(stack.stack_id, "<stack-id>"))
+    snapshot.match("ErrorForCreate", create_ex.value.response)
+    snapshot.match("ErrorForUpdate", update_ex.value.response)
diff --git a/tests/aws/services/cloudformation/api/test_changesets.snapshot.json b/tests/aws/services/cloudformation/api/test_changesets.snapshot.json
@@ -655,5 +655,32 @@
         }
       }
     }
+  },
+  "tests/aws/services/cloudformation/api/test_changesets.py::test_create_changeset_for_deleted_stack": {
+    "recorded-date": "10-10-2025, 18:02:05",
+    "recorded-content": {
+      "ErrorForCreate": {
+        "Error": {
+          "Code": "ValidationError",
+          "Message": "Stack [<stack-id>] already exists and cannot be created again with the changeSet [test].",
+          "Type": "Sender"
+        },
+        "ResponseMetadata": {
+          "HTTPHeaders": {},
+          "HTTPStatusCode": 400
+        }
+      },
+      "ErrorForUpdate": {
+        "Error": {
+          "Code": "ValidationError",
+          "Message": "Stack:<stack-id> is in DELETE_COMPLETE state and can not be updated.",
+          "Type": "Sender"
+        },
+        "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
@@ -77,6 +77,15 @@
   "tests/aws/services/cloudformation/api/test_changesets.py::test_create_change_set_update_without_parameters": {
     "last_validated_date": "2022-05-31T07:32:02+00:00"
   },
+  "tests/aws/services/cloudformation/api/test_changesets.py::test_create_changeset_for_deleted_stack": {
+    "last_validated_date": "2025-10-10T18:02:05+00:00",
+    "durations_in_seconds": {
+      "setup": 0.27,
+      "call": 16.63,
+      "teardown": 0.13,
+      "total": 17.03
+    }
+  },
   "tests/aws/services/cloudformation/api/test_changesets.py::test_create_changeset_with_stack_id": {
     "last_validated_date": "2023-11-28T06:48:23+00:00"
   },
diff --git a/tests/aws/services/cloudformation/api/test_stacks.py b/tests/aws/services/cloudformation/api/test_stacks.py
@@ -1267,32 +1267,3 @@ def test_blank_parameter_value(aws_client: ServiceLevelClientFactory, cleanups):
     cleanups.append(lambda: aws_client.cloudformation.delete_stack(StackName=stack_id))
 
     aws_client.cloudformation.get_waiter("stack_create_complete").wait(StackName=stack_id)
-
-
-@markers.aws.needs_fixing
-def test_duplication_exception(aws_client, deploy_cfn_template):
-    parameter_resource_body = {
-        "Type": "AWS::SSM::Parameter",
-        "Properties": {"Type": "String", "Value": "Test"},
-    }
-    long_template = {"Resources": {f"Parameter{i}": parameter_resource_body for i in range(100)}}
-    short_template = {"Resources": {f"Parameter{i}": parameter_resource_body for i in range(1)}}
-
-    stack = deploy_cfn_template(template=json.dumps(long_template))
-
-    stack.destroy()
-
-    aws_client.cloudformation.create_change_set(
-        StackName=stack.stack_name,
-        ChangeSetName="test",
-        TemplateBody=json.dumps(short_template),
-        ChangeSetType="CREATE",
-    )
-    aws_client.cloudformation.create_change_set(
-        StackName=stack.stack_id,
-        ChangeSetName="test",
-        TemplateBody=json.dumps(short_template),
-        ChangeSetType="UPDATE",
-    )
-
-    aws_client.cloudformation.describe_stacks(StackName=stack.stack_name)
