swift-server/RediStack
1
0
Fork 0
mirror of https://github.com/swift-server/RediStack.git synced 2026-06-02 07:37:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash in tests: Use explicit RedisCommand instead of tuple (#52)

Browse Source
This commit is contained in:
Fabian Fett
2023-06-16 19:15:42 +02:00
committed by GitHub
parent a7d196e813
commit 35e0d67e84
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/RediStackTestUtils/RedisConnectionPoolIntegrationTestCase.swift
+1 -1
View File
@@ -80,7 +80,7 @@ open class RedisConnectionPoolIntegrationTestCase: XCTestCase {
) throws -> RedisConnectionPool {
let address = try SocketAddress.makeAddressResolvingHost(self.redisHostname, port: self.redisPort)
let pool = RedisConnectionPool(
configuration: .init(
configuration: RedisConnectionPool.Configuration(
initialServerConnectionAddresses: [address],
maximumConnectionCount: .maximumActiveConnections(4),
connectionFactoryConfiguration: .init(connectionPassword: self.redisPassword),
Tests/RediStackIntegrationTests/RedisConnectionPoolTests.swift
+1
View File
@@ -40,6 +40,7 @@ final class RedisConnectionPoolTests: RediStackConnectionPoolIntegrationTestCase
func test_nilConnectionRetryTimeoutStillWorks() throws {
let pool = try self.makeNewPool(connectionRetryTimeout: nil)
defer { pool.close() }
XCTAssertNoThrow(try pool.get(#function).wait())
}
}
Tests/RediStackTests/ChannelHandlers/RedisCommandHandlerTests.swift
+4 -4
View File
@@ -56,19 +56,19 @@ final class RedisCommandHandlerTests: XCTestCase {
let getFoo = RESPValue.array([.bulkString(.init(string: "GET")), .bulkString(.init(string: "foo"))])
let promiseFoo = loop.makePromise(of: RESPValue.self)
let commandFoo = (message: getFoo, responsePromise: promiseFoo)
let commandFoo = RedisCommand(message: getFoo, responsePromise: promiseFoo)
XCTAssertNoThrow(try channel.writeOutbound(commandFoo))
XCTAssertEqual(try channel.readOutbound(as: RESPValue.self), getFoo)
let getBar = RESPValue.array([.bulkString(.init(string: "GET")), .bulkString(.init(string: "bar"))])
let promiseBar = loop.makePromise(of: RESPValue.self)
let commandBar = (message: getBar, responsePromise: promiseBar)
let commandBar = RedisCommand(message: getBar, responsePromise: promiseBar)
XCTAssertNoThrow(try channel.writeOutbound(commandBar))
XCTAssertEqual(try channel.readOutbound(as: RESPValue.self), getBar)
let getBaz = RESPValue.array([.bulkString(.init(string: "GET")), .bulkString(.init(string: "baz"))])
let promiseBaz = loop.makePromise(of: RESPValue.self)
let commandBaz = (message: getBaz, responsePromise: promiseBaz)
let commandBaz = RedisCommand(message: getBaz, responsePromise: promiseBaz)
XCTAssertNoThrow(try channel.writeOutbound(commandBaz))
XCTAssertEqual(try channel.readOutbound(as: RESPValue.self), getBaz)
@@ -117,7 +117,7 @@ final class RedisCommandHandlerTests: XCTestCase {
let getBar = RESPValue.array([.bulkString(.init(string: "GET")), .bulkString(.init(string: "bar"))])
let promiseBar = loop.makePromise(of: RESPValue.self)
let commandBar = (message: getBar, responsePromise: promiseBar)
let commandBar = RedisCommand(message: getBar, responsePromise: promiseBar)
channel.write(commandBar, promise: nil)
XCTAssertThrowsError(try promiseBar.futureResult.wait()) {
XCTAssertEqual($0 as? RedisClientError, .connectionClosed)