Move delete to teardown (#245)

* Empty bucket in tear down

* Empty bucket in tear down

Co-authored-by: Gavin Zhang <[email protected]>

Author: GavinZZ

integration/combination/test_connectors.py

@@ -6,6 +6,14 @@
 
 
 class TestConnectors(BaseTest):
+    def tearDown(self):
+        # Some tests will create items in S3 Bucket, which result in stack DELETE_FAILED state
+        # manually empty the bucket to allow stacks to be deleted successfully.
+        bucket_name = self.get_physical_id_by_type("AWS::S3::Bucket")
+        if bucket_name:
+            clean_bucket(bucket_name, self.client_provider.s3_client)
+        super().tearDown()
+
     @parameterized.expand(
         [
             ("combination/connector_function_to_function",),
@@ -50,12 +58,6 @@ def test_connector_by_invoking_a_function(self, template_file_path):
         self.assertEqual(response.get("StatusCode"), 200)
         self.assertEqual(response.get("FunctionError"), None)
 
-        # Some tests will create items in S3 Bucket, which result in stack DELETE_FAILED state
-        # manually empty the bucket to allow stacks to be deleted successfully.
-        bucket_name = self.get_physical_id_by_type("AWS::S3::Bucket")
-        if bucket_name:
-            clean_bucket(bucket_name, s3_client)
-
     @parameterized.expand(
         [
             ("combination/connector_sfn_to_table_read",),
@@ -84,12 +86,6 @@ def test_connector_by_sync_execute_an_state_machine(self, template_file_path):
         # Without permission, it will be "FAILED"
         self.assertEqual(response.get("status"), "SUCCEEDED")
 
-        # Some tests will create items in S3 Bucket, which result in stack DELETE_FAILED state
-        # manually empty the bucket to allow stacks to be deleted successfully.
-        bucket_name = self.get_physical_id_by_type("AWS::S3::Bucket")
-        if bucket_name:
-            clean_bucket(bucket_name, s3_client)
-
     @parameterized.expand(
         [
             ("combination/connector_sfn_to_sfn_sync",),
@@ -146,8 +142,3 @@ def test_connector_by_execute_a_s3_bucket(self, template_file_path):
         response = lambda_client.invoke(**request_params)
         self.assertEqual(response.get("StatusCode"), 200)
         self.assertEqual(response.get("FunctionError"), None)
-
-        # Some tests will create items in S3 Bucket, which result in stack DELETE_FAILED state
-        # manually empty the bucket to allow stacks to be deleted successfully.
-        bucket_name = self.get_physical_id_by_type("AWS::S3::Bucket")
-        clean_bucket(bucket_name, s3_client)