Skip to content

Commit 084c2a9

Browse files
authored
Make unit tests respect env var overrides for DB connection (#292)
* Update unit tests to response MYSQL_USERNAME, MYSQL_PASSWORD, MYSQL_DATABASE, and MYSQL_PORT env vars; previously only MYSQL_HOSTNAME was respected. * Use a simpler expression for MYSQL_PORT
1 parent d4bb8bd commit 084c2a9

File tree

1 file changed

+4
-21
lines changed

1 file changed

+4
-21
lines changed

Tests/MySQLKitTests/MySQLKitTests.swift

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ class MySQLKitTests: XCTestCase {
7272
self.pools = .init(
7373
source: .init(configuration: .init(
7474
hostname: env("MYSQL_HOSTNAME") ?? "localhost",
75-
port: 3306,
76-
username: "vapor_username",
77-
password: "vapor_password",
78-
database: "vapor_database",
75+
port: env("MYSQL_PORT").flatMap(Int.init) ?? 3306,
76+
username: env("MYSQL_USERNAME") ?? "vapor_username",
77+
password: env("MYSQL_PASSWORD") ?? "vapor_password",
78+
database: env("MYSQL_DATABASE") ?? "vapor_database",
7979
tlsConfiguration: .forClient(certificateVerification: .none)
8080
)),
8181
maxConnectionsPerEventLoop: 2,
@@ -103,23 +103,6 @@ class MySQLKitTests: XCTestCase {
103103
}
104104
}
105105

106-
extension MySQLConnection {
107-
static func test(on eventLoop: EventLoop) -> EventLoopFuture<MySQLConnection> {
108-
do {
109-
return try self.connect(
110-
to: .makeAddressResolvingHost(env("MYSQL_HOSTNAME") ?? "localhost", port: 3306),
111-
username: "vapor_username",
112-
database: "vapor_database",
113-
password: "vapor_password",
114-
tlsConfiguration: .forClient(certificateVerification: .none),
115-
on: eventLoop
116-
)
117-
} catch {
118-
return eventLoop.makeFailedFuture(error)
119-
}
120-
}
121-
}
122-
123106
func env(_ name: String) -> String? {
124107
getenv(name).flatMap { String(cString: $0) }
125108
}

0 commit comments

Comments
 (0)