From 970e3a5092297a23e3e1cb62ffdaab2e453c1277 Mon Sep 17 00:00:00 2001 From: Brett Wooldridge Date: Tue, 14 Jan 2014 21:18:05 +0900 Subject: [PATCH] Increate timing window to avoid time-sensitive failures in unit tests on slow machines. --- src/test/java/com/zaxxer/hikari/CreationTest.java | 5 ++--- src/test/resources/propfile1.properties | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/com/zaxxer/hikari/CreationTest.java b/src/test/java/com/zaxxer/hikari/CreationTest.java index b12b06f0..d884d458 100644 --- a/src/test/java/com/zaxxer/hikari/CreationTest.java +++ b/src/test/java/com/zaxxer/hikari/CreationTest.java @@ -93,11 +93,10 @@ public class CreationTest config.setMinimumPoolSize(1); config.setMaximumPoolSize(1); config.setAcquireIncrement(1); - config.setMaxLifetime(TimeUnit.SECONDS.toMillis(30)); config.setConnectionTestQuery("VALUES 1"); config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource"); - System.setProperty("com.zaxxer.hikari.housekeeping.period", "500"); + System.setProperty("com.zaxxer.hikari.housekeeping.period", "250"); HikariDataSource ds = new HikariDataSource(config); @@ -121,7 +120,7 @@ public class CreationTest Assert.assertSame("Expected the same connection", connection, connection2); connection2.close(); - Thread.sleep(900); + Thread.sleep(1001); connection2 = ds.getConnection(); Assert.assertNotSame("Expected a different connection", connection, connection2); diff --git a/src/test/resources/propfile1.properties b/src/test/resources/propfile1.properties index 816d1f79..9502e4a8 100644 --- a/src/test/resources/propfile1.properties +++ b/src/test/resources/propfile1.properties @@ -2,3 +2,4 @@ acquireIncrement=3 acquireRetryDelay=1000 connectionTestQuery=SELECT 1 autoCommit=false +dataSourceClassName=com.zaxxer.hikari.mocks.StubDataSource