Fix HBXCTLive throwing errors

hummingbird-project · Dec 21, 2023 · c9ee787 · c9ee787
1 parent 57a2ec5
commit c9ee787
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/Sources/Hummingbird/Codable/CodableProtocols.swift b/Sources/Hummingbird/Codable/CodableProtocols.swift
@@ -49,6 +49,6 @@ public struct NullEncoder: HBResponseEncoder {
 public struct NullDecoder: HBRequestDecoder {
     public init() {}
     public func decode<T: Decodable>(_ type: T.Type, from request: HBRequest, context: some HBBaseRequestContext) throws -> T {
-        preconditionFailure("HBApplication.decoder has not been set")
+        preconditionFailure("Request context decoder has not been set")
     }
 }
diff --git a/Sources/HummingbirdXCT/HBXCTLive.swift b/Sources/HummingbirdXCT/HBXCTLive.swift
@@ -43,7 +43,7 @@ final class HBXCTLive<App: HBApplicationProtocol>: HBXCTApplication {
     }
 
     init(app: App) {
-        self.timeout = .seconds(15)
+        self.timeout = .seconds(20)
         self.application = TestApplication(base: app)
     }
 
@@ -64,17 +64,23 @@ final class HBXCTLive<App: HBApplicationProtocol>: HBXCTApplication {
             let client = HBXCTClient(
                 host: "localhost",
                 port: port,
-                configuration: .init(timeout: .seconds(2)),
+                configuration: .init(timeout: self.timeout),
                 eventLoopGroupProvider: .createNew
             )
             client.connect()
-            let value = try await test(Client(client: client))
-            await serviceGroup.triggerGracefulShutdown()
-            try await client.shutdown()
-            return value
+            do {
+                let value = try await test(Client(client: client))
+                await serviceGroup.triggerGracefulShutdown()
+                try await client.shutdown()
+                return value
+            } catch {
+                await serviceGroup.triggerGracefulShutdown()
+                try await client.shutdown()
+                throw error
+            }
         }
     }
 
     let application: TestApplication<App>
-    let timeout: TimeAmount
+    let timeout: Duration
 }