add e2e test project reset and add reset to hotswap retries (#2380)

.changeset/stale-pianos-marry.md

@@ -0,0 +1,2 @@
+---
+---

packages/integration-tests/src/test-e2e/sandbox/sandbox.test.template.ts

@@ -86,8 +86,12 @@ export const defineSandboxTest = (testProjectCreator: TestProjectCreator) => {
           if (updates.length > 0) {
             // retry hotswapping resources if deployment time is higher than the threshold
             await runWithRetry(
-              async () => {
-                // keeping initial deployment in retry loop to reset app state for each hotswap to be a non no-op
+              async (attempt) => {
+                if (attempt > 1) {
+                  // reset test project to pre-update state to retry hotswap
+                  await testProject.reset();
+                }
+
                 const processController = ampxCli(
                   ['sandbox', '--dirToWatch', 'amplify'],
                   testProject.projectDirPath,

packages/integration-tests/src/test-project-setup/test_project_base.ts

@@ -26,6 +26,7 @@ import path from 'path';
 import { AmplifyClient } from '@aws-sdk/client-amplify';
 import { pathToFileURL } from 'url';
 import isMatch from 'lodash.ismatch';
+import { setupDirAsEsmModule } from './setup_dir_as_esm_module.js';
 
 export type PlatformDeploymentThresholds = {
   onWindows: number;
@@ -247,4 +248,15 @@ export abstract class TestProjectBase {
 
     assert.ok(isMatch(currentCodebaseOutputs, npmOutputs));
   }
+
+  /**
+   * Resets the project to its initial state
+   */
+  async reset() {
+    await fsp.rm(this.projectAmplifyDirPath, { recursive: true, force: true });
+    await fsp.cp(this.sourceProjectAmplifyDirURL, this.projectAmplifyDirPath, {
+      recursive: true,
+    });
+    await setupDirAsEsmModule(this.projectAmplifyDirPath);
+  }
 }