From b5d55233ecd4ca22ea40eec347c6e307689780e4 Mon Sep 17 00:00:00 2001
From: Jason Bedard <jason+github@jbedard.ca>
Date: Mon, 25 Jul 2022 16:10:09 -0700
Subject: [PATCH] test: revert local test project file changes on test
 completion

---
 .../e2e/tests/misc/supported-angular.ts        | 18 ++++++++++--------
 tests/legacy-cli/e2e_runner.ts                 | 12 +++++++-----
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/tests/legacy-cli/e2e/tests/misc/supported-angular.ts b/tests/legacy-cli/e2e/tests/misc/supported-angular.ts
index f4aea2539267..d5299485bb7f 100644
--- a/tests/legacy-cli/e2e/tests/misc/supported-angular.ts
+++ b/tests/legacy-cli/e2e/tests/misc/supported-angular.ts
@@ -24,12 +24,14 @@ export default async function () {
 
   // Major should succeed, but we don't need to test it here since it's tested everywhere else.
   // Major+1 and -1 should fail architect commands, but allow other commands.
-  await fakeCoreVersion(cliMajor + 1);
-  await expectToFail(() => ng('build'), 'Should fail Major+1');
-  await ng('version');
-  await fakeCoreVersion(cliMajor - 1);
-  await ng('version');
-
-  // Restore the original core package.json.
-  await writeFile(angularCorePkgPath, originalAngularCorePkgJson);
+  try {
+    await fakeCoreVersion(cliMajor + 1);
+    await expectToFail(() => ng('build'), 'Should fail Major+1');
+    await ng('version');
+    await fakeCoreVersion(cliMajor - 1);
+    await ng('version');
+  } finally {
+    // Restore the original core package.json.
+    await writeFile(angularCorePkgPath, originalAngularCorePkgJson);
+  }
 }
diff --git a/tests/legacy-cli/e2e_runner.ts b/tests/legacy-cli/e2e_runner.ts
index 150d81450083..2b2de6c8482b 100644
--- a/tests/legacy-cli/e2e_runner.ts
+++ b/tests/legacy-cli/e2e_runner.ts
@@ -242,13 +242,15 @@ async function runInitializer(absoluteName: string) {
 async function runTest(absoluteName: string) {
   process.chdir(join(getGlobalVariable('projects-root'), 'test-project'));
 
-  await launchTestProcess(absoluteName);
-
-  logStack.push(new logging.NullLogger());
   try {
-    await gitClean();
+    await launchTestProcess(absoluteName);
   } finally {
-    logStack.pop();
+    logStack.push(new logging.NullLogger());
+    try {
+      await gitClean();
+    } finally {
+      logStack.pop();
+    }
   }
 }