Improve EndToEndTests cleanup, DRY out test case methods

Author: xtremekforever

Tests/SwiftSDKGeneratorTests/EndToEndTests.swift

@@ -34,14 +34,12 @@ extension FileManager {
     try createDirectory(at: temporaryDirectory, withIntermediateDirectories: false)
     defer {
         // Best effort cleanup.
-        do {
-            if cleanup {
-                try removeItem(at: temporaryDirectory)
-                logger.info("Removed temporary directory")
-            } else {
-                logger.info("Keeping temporary directory")
-            }
-        } catch {}
+        if cleanup {
+            try? removeItem(at: temporaryDirectory)
+            logger.info("Removed temporary directory")
+        } else {
+            logger.info("Keeping temporary directory")
+        }
     }
 
     logger.info("Created temporary directory")
@@ -274,6 +272,8 @@ func buildTestcase(_ logger: Logger, testcase: String, bundleName: String, tempD
 }
 
 func buildTestcases(config: SDKConfiguration) async throws {
+  try skipSlow()
+
   var logger = Logger(label: "EndToEndTests")
   logger[metadataKey: "testcase"] = "testPackageInitExecutable"
 
@@ -293,17 +293,26 @@ func buildTestcases(config: SDKConfiguration) async throws {
     try await buildSDK(logger, scratchPath: tempDir.path, withArguments: config.sdkGeneratorArguments)
   }
 
-  logger.info("Built SDK")
+  logger.info("Built Swift SDK")
+
+  // Cleanup 
+  let cleanupSdk: () async -> Void = {
+    logger.info("Removing Swift SDK to cleanup...")
+    try? await Shell.run("swift experimental-sdk remove \(bundleName)")
+  }
 
   for testcase in testcases {
-    try await FileManager.default.withTemporaryDirectory(logger: logger) { tempDir in
-      try await buildTestcase(logger, testcase: testcase, bundleName: bundleName, tempDir: tempDir)
+    do {
+      try await FileManager.default.withTemporaryDirectory(logger: logger) { tempDir in
+        try await buildTestcase(logger, testcase: testcase, bundleName: bundleName, tempDir: tempDir)
+      }
+    } catch {
+      await cleanupSdk()
+      throw error
     }
   }
 
-  // Cleanup
-  logger.info("Removing SDK to cleanup...")
-  try await Shell.run("swift experimental-sdk remove \(bundleName)")
+  await cleanupSdk()
 }
 
 final class Swift59_UbuntuEndToEndTests: XCTestCase {
@@ -316,22 +325,18 @@ final class Swift59_UbuntuEndToEndTests: XCTestCase {
   )
 
   func testAarch64Direct() async throws {
-    try skipSlow()
     try await buildTestcases(config: config.withArchitecture("aarch64"))
   }
 
   func testX86_64Direct() async throws {
-    try skipSlow()
     try await buildTestcases(config: config.withArchitecture("x86_64"))
   }
 
   func testAarch64FromContainer() async throws {
-    try skipSlow()
     try await buildTestcases(config: config.withArchitecture("aarch64").withDocker())
   }
 
   func testX86_64FromContainer() async throws {
-    try skipSlow()
     try await buildTestcases(config: config.withArchitecture("x86_64").withDocker())
   }
 }
@@ -346,22 +351,18 @@ final class Swift510_UbuntuEndToEndTests: XCTestCase {
   )
 
   func testAarch64Direct() async throws {
-    try skipSlow()
     try await buildTestcases(config: config.withArchitecture("aarch64"))
   }
 
   func testX86_64Direct() async throws {
-    try skipSlow()
     try await buildTestcases(config: config.withArchitecture("x86_64"))
   }
 
   func testAarch64FromContainer() async throws {
-    try skipSlow()
     try await buildTestcases(config: config.withArchitecture("aarch64").withDocker())
   }
 
   func testX86_64FromContainer() async throws {
-    try skipSlow()
     try await buildTestcases(config: config.withArchitecture("x86_64").withDocker())
   }
 }
@@ -376,22 +377,18 @@ final class Swift60_UbuntuEndToEndTests: XCTestCase {
   )
 
   func testAarch64Direct() async throws {
-    try skipSlow()
     try await buildTestcases(config: config.withArchitecture("aarch64"))
   }
 
   func testX86_64Direct() async throws {
-    try skipSlow()
     try await buildTestcases(config: config.withArchitecture("x86_64"))
   }
 
   func testAarch64FromContainer() async throws {
-    try skipSlow()
     try await buildTestcases(config: config.withArchitecture("aarch64").withDocker())
   }
 
   func testX86_64FromContainer() async throws {
-    try skipSlow()
     try await buildTestcases(config: config.withArchitecture("x86_64").withDocker())
   }
 }
@@ -406,12 +403,10 @@ final class Swift59_RHELEndToEndTests: XCTestCase {
   )
 
   func testAarch64FromContainer() async throws {
-    try skipSlow()
     try await buildTestcases(config: config.withArchitecture("aarch64").withDocker())
   }
 
   func testX86_64FromContainer() async throws {
-    try skipSlow()
     try await buildTestcases(config: config.withArchitecture("x86_64").withDocker())
   }
 }
@@ -426,12 +421,10 @@ final class Swift510_RHELEndToEndTests: XCTestCase {
   )
 
   func testAarch64FromContainer() async throws {
-    try skipSlow()
     try await buildTestcases(config: config.withArchitecture("aarch64").withDocker())
   }
 
   func testX86_64FromContainer() async throws {
-    try skipSlow()
     try await buildTestcases(config: config.withArchitecture("x86_64").withDocker())
   }
 }
@@ -446,12 +439,10 @@ final class Swift60_RHELEndToEndTests: XCTestCase {
   )
 
   func testAarch64FromContainer() async throws {
-    try skipSlow()
     try await buildTestcases(config: config.withArchitecture("aarch64").withDocker())
   }
 
   func testX86_64FromContainer() async throws {
-    try skipSlow()
     try await buildTestcases(config: config.withArchitecture("x86_64").withDocker())
   }
 }