Commit 8952103

authored

Throw errors instead of crashing when things go wrong during test setup, such as failure to connect to the database. (vapor#144)

1 parent a7b7e34 commit 8952103Copy full SHA for 8952103

File tree

-6

lines changed

-6

lines changed

Lines changed: 9 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,9 @@ final class FluentPostgresDriverTests: XCTestCase {`
`168`	`168`	`self.db as! PostgresDatabase`
`169`	`169`	`}`
`170`	`170`
`171`		`- override func setUp() {`
	`171`	`+ override func setUpWithError() throws {`
	`172`	`+ try super.setUpWithError()`
	`173`	`+`
`172`	`174`	`let configuration = PostgresConfiguration(`
`173`	`175`	`hostname: hostname,`
`174`	`176`	`username: "vapor_username",`
`@@ -182,14 +184,15 @@ final class FluentPostgresDriverTests: XCTestCase {`
`182`	`184`	`self.dbs.use(.postgres(configuration: configuration), as: .psql)`
`183`	`185`
`184`	`186`	`// reset the database`
`185`		`- _ = try! self.postgres.query("drop schema public cascade").wait()`
`186`		`- _ = try! self.postgres.query("create schema public").wait()`
	`187`	`+ _ = try self.postgres.query("drop schema public cascade").wait()`
	`188`	`+ _ = try self.postgres.query("create schema public").wait()`
`187`	`189`	`}`
`188`	`190`
`189`		`- override func tearDown() {`
	`191`	`+ override func tearDownWithError()throws {`
`190`	`192`	`self.dbs.shutdown()`
`191`		`- try! self.threadPool.syncShutdownGracefully()`
`192`		`- try! self.eventLoopGroup.syncShutdownGracefully()`
	`193`	`+ try self.threadPool.syncShutdownGracefully()`
	`194`	`+ try self.eventLoopGroup.syncShutdownGracefully()`
	`195`	`+ try super.tearDownWithError()`
`193`	`196`	`}`
`194`	`197`	`}`
`195`	`198`

Comments

(0)