More swiftly test cleanup routines

Bump the default http client read timeout

Author: cmcgee1024

Sources/LinuxPlatform/Linux.swift

@@ -361,6 +361,9 @@ public struct Linux: Platform {
         }
 
         let tmpDir = self.getTempFilePath()
+        defer {
+            try? FileManager.default.removeItem(at: tmpDir)
+        }
         try FileManager.default.createDirectory(atPath: tmpDir.path, withIntermediateDirectories: true)
 
         ctx.print("Extracting new swiftly...")

Sources/SwiftlyCore/HTTPClient.swift

@@ -124,7 +124,7 @@ public class HTTPRequestExecutorImpl: HTTPRequestExecutor {
     }
 
     public func getCurrentSwiftlyRelease() async throws -> Components.Schemas.SwiftlyRelease {
-        let config = AsyncHTTPClientTransport.Configuration(client: self.httpClient, timeout: .seconds(45))
+        let config = AsyncHTTPClientTransport.Configuration(client: self.httpClient, timeout: .seconds(60))
         let swiftlyUserAgent = SwiftlyUserAgentMiddleware()
 
         let client = Client(
@@ -138,7 +138,7 @@ public class HTTPRequestExecutorImpl: HTTPRequestExecutor {
     }
 
     public func getReleaseToolchains() async throws -> [Components.Schemas.Release] {
-        let config = AsyncHTTPClientTransport.Configuration(client: self.httpClient, timeout: .seconds(45))
+        let config = AsyncHTTPClientTransport.Configuration(client: self.httpClient, timeout: .seconds(60))
         let swiftlyUserAgent = SwiftlyUserAgentMiddleware()
 
         let client = Client(
@@ -153,7 +153,7 @@ public class HTTPRequestExecutorImpl: HTTPRequestExecutor {
     }
 
     public func getSnapshotToolchains(branch: Components.Schemas.SourceBranch, platform: Components.Schemas.PlatformIdentifier) async throws -> Components.Schemas.DevToolchains {
-        let config = AsyncHTTPClientTransport.Configuration(client: self.httpClient, timeout: .seconds(45))
+        let config = AsyncHTTPClientTransport.Configuration(client: self.httpClient, timeout: .seconds(60))
         let swiftlyUserAgent = SwiftlyUserAgentMiddleware()
 
         let client = Client(
@@ -457,7 +457,7 @@ public struct SwiftlyHTTPClient {
         }
 
         let request = makeRequest(url: url.absoluteString)
-        let response = try await self.httpRequestExecutor.execute(request, timeout: .seconds(45))
+        let response = try await self.httpRequestExecutor.execute(request, timeout: .seconds(60))
 
         switch response.status {
         case .ok:

Tests/SwiftlyTests/PlatformTests.swift

@@ -4,7 +4,7 @@ import Foundation
 import Testing
 
 @Suite struct PlatformTests {
-    func mockToolchainDownload(version: String) async throws -> (URL, ToolchainVersion) {
+    func mockToolchainDownload(version: String) async throws -> (URL, ToolchainVersion, URL) {
         let mockDownloader = MockToolchainDownloader(executables: ["swift"])
         let version = try! ToolchainVersion(parsing: version)
         let ext = Swiftly.currentPlatform.toolchainFileExtension
@@ -14,28 +14,37 @@ import Testing
         let mockedToolchain = try mockDownloader.makeMockedToolchain(toolchain: version, name: tmpDir.path)
         try mockedToolchain.write(to: mockedToolchainFile)
 
-        return (mockedToolchainFile, version)
+        return (mockedToolchainFile, version, tmpDir)
     }
 
     @Test(.testHome()) func install() async throws {
         // GIVEN: a toolchain has been downloaded
-        var (mockedToolchainFile, version) = try await self.mockToolchainDownload(version: "5.7.1")
+        var (mockedToolchainFile, version, tmpDir) = try await self.mockToolchainDownload(version: "5.7.1")
+        var cleanup = [tmpDir]
+        defer {
+            for dir in cleanup {
+                try? FileManager.default.removeItem(at: dir)
+            }
+        }
+
         // WHEN: the platform installs the toolchain
         try Swiftly.currentPlatform.install(SwiftlyTests.ctx, from: mockedToolchainFile, version: version, verbose: true)
         // THEN: the toolchain is extracted in the toolchains directory
         var toolchains = try FileManager.default.contentsOfDirectory(at: Swiftly.currentPlatform.swiftlyToolchainsDir(SwiftlyTests.ctx), includingPropertiesForKeys: nil)
         #expect(1 == toolchains.count)
 
         // GIVEN: a second toolchain has been downloaded
-        (mockedToolchainFile, version) = try await self.mockToolchainDownload(version: "5.8.0")
+        (mockedToolchainFile, version, tmpDir) = try await self.mockToolchainDownload(version: "5.8.0")
+        cleanup += [tmpDir]
         // WHEN: the platform installs the toolchain
         try Swiftly.currentPlatform.install(SwiftlyTests.ctx, from: mockedToolchainFile, version: version, verbose: true)
         // THEN: the toolchain is added to the toolchains directory
         toolchains = try FileManager.default.contentsOfDirectory(at: Swiftly.currentPlatform.swiftlyToolchainsDir(SwiftlyTests.ctx), includingPropertiesForKeys: nil)
         #expect(2 == toolchains.count)
 
         // GIVEN: an identical toolchain has been downloaded
-        (mockedToolchainFile, version) = try await self.mockToolchainDownload(version: "5.8.0")
+        (mockedToolchainFile, version, tmpDir) = try await self.mockToolchainDownload(version: "5.8.0")
+        cleanup += [tmpDir]
         // WHEN: the platform installs the toolchain
         try Swiftly.currentPlatform.install(SwiftlyTests.ctx, from: mockedToolchainFile, version: version, verbose: true)
         // THEN: the toolchains directory remains the same
@@ -45,9 +54,16 @@ import Testing
 
     @Test(.testHome()) func uninstall() async throws {
         // GIVEN: toolchains have been downloaded, and installed
-        var (mockedToolchainFile, version) = try await self.mockToolchainDownload(version: "5.8.0")
+        var (mockedToolchainFile, version, tmpDir) = try await self.mockToolchainDownload(version: "5.8.0")
+        var cleanup = [tmpDir]
+        defer {
+            for dir in cleanup {
+                try? FileManager.default.removeItem(at: dir)
+            }
+        }
         try Swiftly.currentPlatform.install(SwiftlyTests.ctx, from: mockedToolchainFile, version: version, verbose: true)
-        (mockedToolchainFile, version) = try await self.mockToolchainDownload(version: "5.6.3")
+        (mockedToolchainFile, version, tmpDir) = try await self.mockToolchainDownload(version: "5.6.3")
+        cleanup += [tmpDir]
         try Swiftly.currentPlatform.install(SwiftlyTests.ctx, from: mockedToolchainFile, version: version, verbose: true)
         // WHEN: one of the toolchains is uninstalled
         try Swiftly.currentPlatform.uninstall(SwiftlyTests.ctx, version, verbose: true)