Skip to content

Commit 02053ad

Browse files
committed
changed configuration a bit more for longer timeouts in jenkins
Signed-off-by: Joern Bernhardt <jb@campudus.com>
1 parent 4b1b5a1 commit 02053ad

File tree

4 files changed

+7
-12
lines changed

4 files changed

+7
-12
lines changed

src/test/scala/io/vertx/asyncsql/test/SqlTestVerticle.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ import org.vertx.testtools.VertxAssert.{assertEquals, assertTrue}
1010

1111
abstract class SqlTestVerticle extends TestVerticle with BaseVertxIntegrationTest {
1212

13+
val address = "campudus.asyncdb"
14+
15+
protected val baseConf = Json.obj("address" -> address, "maxPoolSize" -> 3, "transactionTimeout" -> 5000L)
16+
1317
override final def before() {}
1418
override def asyncBefore(): Future[Unit] = {
1519
val p = Promise[Unit]

src/test/scala/io/vertx/asyncsql/test/mysql/MySqlTest.scala

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,11 @@ import org.vertx.testtools.VertxAssert._
77

88
class MySqlTest extends SqlTestVerticle with BaseSqlTests {
99

10-
val address = "campudus.asyncdb"
11-
val config = Json.obj("address" -> address, "connection" -> "MySQL", "maxPoolSize" -> 3)
12-
1310
override def isMysql = true
1411

1512
override def doBefore() = expectOk(raw("DROP TABLE IF EXISTS `some_test`"))
1613

17-
override def getConfig = config
14+
override def getConfig() = baseConf.putString("connection", "MySQL")
1815

1916
override def createDateTable(dateDataType: String) = s"""
2017
| CREATE TABLE date_test (

src/test/scala/io/vertx/asyncsql/test/postgresql/BadlyConfiguredPostgreSqlTest.scala

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@ import scala.concurrent.Future
88

99
class BadlyConfiguredPostgreSqlTest extends SqlTestVerticle {
1010

11-
val address = "campudus.asyncdb"
12-
val config = Json.obj("address" -> address, "database" -> "nonexistent")
13-
14-
override def getConfig = config
11+
override def getConfig() = baseConf.putString("database", "nonexistent")
1512

1613
@Test
1714
def testNonExistentDatabase(): Unit = asyncTest {

src/test/scala/io/vertx/asyncsql/test/postgresql/PostgreSqlTest.scala

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ import io.vertx.asyncsql.test.{ BaseSqlTests, SqlTestVerticle }
55

66
class PostgreSqlTest extends SqlTestVerticle with BaseSqlTests {
77

8-
val address = "campudus.asyncdb"
9-
val config = Json.obj("address" -> address, "maxPoolSize" -> 3)
10-
11-
override def getConfig = config
8+
override def getConfig() = baseConf
129

1310
}

0 commit comments

Comments
 (0)