Merge branch 'develop' into dependabot/pip/develop/click-8.3.1

Author: Vandita2020

tests/integration/pipeline/base.py

@@ -65,13 +65,32 @@ def setUp(self):
         super().setUp()
         shutil.rmtree(os.path.join(os.getcwd(), ".aws-sam", "pipeline"), ignore_errors=True)
 
+    # Max time in seconds to wait for each stack deletion to complete
+    STACK_DELETE_TIMEOUT_SECONDS = 180
+
     def tearDown(self):
         for stack_name in self.stack_names:
             self._cleanup_s3_buckets(stack_name)
             self.cf_client.delete_stack(StackName=stack_name)
+        self._wait_for_stack_deletions()
         shutil.rmtree(os.path.join(os.getcwd(), ".aws-sam", "pipeline"), ignore_errors=True)
         super().tearDown()
 
+    def _wait_for_stack_deletions(self):
+        """Wait for all stack deletions to complete so subsequent runs don't collide."""
+        waiter = self.cf_client.get_waiter("stack_delete_complete")
+        for stack_name in self.stack_names:
+            try:
+                waiter.wait(
+                    StackName=stack_name,
+                    WaiterConfig={
+                        "Delay": 10,
+                        "MaxAttempts": self.STACK_DELETE_TIMEOUT_SECONDS // 10,
+                    },
+                )
+            except botocore.exceptions.WaiterError:
+                logging.warning("Timed out waiting for stack %s to delete", stack_name)
+
     def _cleanup_s3_buckets(self, stack_name):
         try:
             stack_resources = self.cf_client.describe_stack_resources(StackName=stack_name)

tests/integration/sync/test_sync_build_in_source.py

@@ -33,6 +33,9 @@ def tearDown(self):
             if os.path.isfile(path):
                 os.remove(path)
 
+        # Clear the build cache so reruns re-execute the Makefile and recreate marker files
+        shutil.rmtree(self.test_data_path.joinpath(".aws-sam"), ignore_errors=True)
+
     @parameterized.expand(
         [
             (True, True),  # build in source
@@ -94,6 +97,9 @@ def tearDown(self):
             if os.path.isfile(path):
                 os.remove(path)
 
+        # Clear the build cache so reruns re-execute the Makefile and recreate marker files
+        shutil.rmtree(Path(self.test_data_path, ".aws-sam"), ignore_errors=True)
+
     @parameterized.expand(
         [
             (True, True),  # build in source