Skip to content

Commit e6363f8

Browse files
committed
Fix 6.1 compile error, fix tests
Signed-off-by: Adam Fowler <adamfowler71@gmail.com>
1 parent 33cde22 commit e6363f8

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

Sources/Valkey/Connection/ValkeyConnection.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ public final actor ValkeyConnection: ValkeyClientProtocol, Sendable {
466466
buffer: ByteBuffer,
467467
promises: [EventLoopPromise<RESPToken>],
468468
valkeyPromises: [ValkeyPromise<RESPToken>],
469-
processResults: sending ([EventLoopPromise<RESPToken>]) async -> Value
469+
processResults: sending ([EventLoopPromise<RESPToken>]) async -> sending Value
470470
) async -> Value {
471471
let requestID = Self.requestIDGenerator.next()
472472
return await withTaskCancellationHandler {

Tests/ValkeyTests/ValkeyConnectionTests.swift

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -290,12 +290,13 @@ struct ConnectionTests {
290290
try await channel.writeInbound(RESPToken(.simpleString("QUEUED")).base)
291291
try await channel.writeInbound(RESPToken(.simpleError("ERROR")).base)
292292
try await channel.writeInbound(RESPToken(.simpleError("EXECABORT")).base)
293-
do {
294-
_ = try await asyncResults
295-
Issue.record("Transaction should throw error")
296-
} catch let error as ValkeyClientError {
297-
#expect(error == ValkeyClientError(.commandError, message: "EXECABORT"))
298-
}
293+
let results = try await asyncResults
294+
var error = #expect(throws: ValkeyClientError.self) { try results.0.get() }
295+
#expect(error?.errorCode == .commandError)
296+
#expect(error?.message == "EXECABORT")
297+
error = #expect(throws: ValkeyClientError.self) { try results.1.get() }
298+
#expect(error?.errorCode == .commandError)
299+
#expect(error?.message == "ERROR")
299300
}
300301

301302
@Test
@@ -373,12 +374,13 @@ struct ConnectionTests {
373374
try await channel.writeInbound(RESPToken(.simpleString("QUEUED")).base)
374375
try await channel.writeInbound(RESPToken(.simpleError("ERROR")).base)
375376
try await channel.writeInbound(RESPToken(.simpleError("EXECABORT")).base)
376-
do {
377-
_ = try await asyncResults
378-
Issue.record("Transaction should throw error")
379-
} catch let error as ValkeyClientError {
380-
#expect(error == ValkeyClientError(.commandError, message: "EXECABORT"))
381-
}
377+
let results = try await asyncResults
378+
var error = #expect(throws: ValkeyClientError.self) { try results[0].get() }
379+
#expect(error?.errorCode == .commandError)
380+
#expect(error?.message == "EXECABORT")
381+
error = #expect(throws: ValkeyClientError.self) { try results[1].get() }
382+
#expect(error?.errorCode == .commandError)
383+
#expect(error?.message == "ERROR")
382384
}
383385

384386
@Test

0 commit comments

Comments
 (0)