You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by ni...@apache.org on 2018/05/04 02:50:49 UTC
polygene-java git commit: Trying to fix MySQL/Docker related issues.
Repository: polygene-java
Updated Branches:
refs/heads/develop 42bc67f2c -> c11e9c2df
Trying to fix MySQL/Docker related issues.
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/c11e9c2d
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/c11e9c2d
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/c11e9c2d
Branch: refs/heads/develop
Commit: c11e9c2df1ee765e4a349babd0e8679dfa70f58c
Parents: 42bc67f
Author: niclas <ni...@hedhman.org>
Authored: Fri May 4 10:50:34 2018 +0800
Committer: niclas <ni...@hedhman.org>
Committed: Fri May 4 10:50:34 2018 +0800
----------------------------------------------------------------------
.../entitystore/sql/MariaDbEntityStoreTest.java | 18 +++++----------
.../sql/MariaDbEntityStoreTestSuite.java | 15 ++++---------
.../entitystore/sql/MySQLEntityStoreTest.java | 23 +++++++-------------
.../sql/MySQLEntityStoreTestSuite.java | 18 +++++----------
.../sqlkv/MariaDbEntityStoreTest.java | 22 ++++++++++++-------
.../sqlkv/MariaDbEntityStoreTestSuite.java | 12 ++++++++--
.../entitystore/sqlkv/MySQLEntityStoreTest.java | 14 +++++++++---
.../sqlkv/MySQLEntityStoreTestSuite.java | 14 +++++++++---
8 files changed, 69 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c11e9c2d/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MariaDbEntityStoreTest.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MariaDbEntityStoreTest.java b/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MariaDbEntityStoreTest.java
index 7562dd6..e76abfd 100644
--- a/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MariaDbEntityStoreTest.java
+++ b/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MariaDbEntityStoreTest.java
@@ -23,9 +23,7 @@ import com.github.junit5docker.Docker;
import com.github.junit5docker.Environment;
import com.github.junit5docker.Port;
import com.github.junit5docker.WaitFor;
-import java.lang.reflect.UndeclaredThrowableException;
import org.apache.polygene.api.common.Visibility;
-import org.apache.polygene.bootstrap.AssemblyException;
import org.apache.polygene.bootstrap.ModuleAssembly;
import org.apache.polygene.entitystore.sql.assembly.MariaDbSQLEntityStoreAssembler;
import org.apache.polygene.library.sql.assembly.DataSourceAssembler;
@@ -44,23 +42,17 @@ import org.junit.jupiter.api.BeforeAll;
@Environment( key = "MYSQL_ALLOW_EMPTY_PASSWORD", value = "yes" ),
@Environment( key = "MYSQL_DATABASE", value = "jdbc_test_db" )
},
- waitFor = @WaitFor( value = "mariadb.org binary distribution", timeoutInMillis = 30000 ),
+ waitFor = @WaitFor( value = "mariadb.org binary distribution", timeoutInMillis = 120000 ),
newForEachCase = false
)
public class MariaDbEntityStoreTest extends AbstractEntityStoreTest
{
@BeforeAll
- public static void waitForDockerToSettle()
+ static void waitForDockerToSettle()
+ throws Exception
{
- try
- {
- Thread.sleep( 5000 );
- }
- catch( InterruptedException e )
- {
- throw new UndeclaredThrowableException( e );
- }
+ Thread.sleep( 15000 );
}
@Override
@@ -100,7 +92,7 @@ public class MariaDbEntityStoreTest extends AbstractEntityStoreTest
DataSourceConfiguration defaults = config.forMixin( DataSourceConfiguration.class ).declareDefaults();
defaults.url().set( "jdbc:mysql://" + host + ":" + port
+ "/jdbc_test_db?profileSQL=false&useLegacyDatetimeCode=false&serverTimezone=UTC"
- + "&nullCatalogMeansCurrent=true&nullNamePatternMatchesAll=true" );
+ + "&nullCatalogMeansCurrent=true&nullNamePatternMatchesAll=true&useSSL=false" );
defaults.driver().set( "com.mysql.jdbc.Driver" );
defaults.enabled().set( true );
defaults.username().set( "root" );
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c11e9c2d/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MariaDbEntityStoreTestSuite.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MariaDbEntityStoreTestSuite.java b/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MariaDbEntityStoreTestSuite.java
index 865361e..849aad9 100644
--- a/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MariaDbEntityStoreTestSuite.java
+++ b/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MariaDbEntityStoreTestSuite.java
@@ -23,7 +23,6 @@ import com.github.junit5docker.Docker;
import com.github.junit5docker.Environment;
import com.github.junit5docker.Port;
import com.github.junit5docker.WaitFor;
-import java.lang.reflect.UndeclaredThrowableException;
import org.apache.polygene.api.common.Visibility;
import org.apache.polygene.bootstrap.ModuleAssembly;
import org.apache.polygene.entitystore.sql.assembly.MySQLEntityStoreAssembler;
@@ -42,22 +41,16 @@ import org.junit.jupiter.api.BeforeAll;
@Environment( key = "MYSQL_ALLOW_EMPTY_PASSWORD", value = "yes" ),
@Environment( key = "MYSQL_DATABASE", value = "jdbc_test_db" )
},
- waitFor = @WaitFor( value = "mariadb.org binary distribution", timeoutInMillis = 30000 ),
+ waitFor = @WaitFor( value = "mariadb.org binary distribution", timeoutInMillis = 120000 ),
newForEachCase = false
)
public class MariaDbEntityStoreTestSuite extends EntityStoreTestSuite
{
@BeforeAll
static void waitForDockerToSettle()
+ throws Exception
{
- try
- {
- Thread.sleep( 5000 );
- }
- catch( InterruptedException e )
- {
- throw new UndeclaredThrowableException( e );
- }
+ Thread.sleep( 15000 );
}
@Override
@@ -91,7 +84,7 @@ public class MariaDbEntityStoreTestSuite extends EntityStoreTestSuite
defaults
.url().set( "jdbc:mysql://" + mysqlHost + ":" + mysqlPort
+ "/jdbc_test_db?profileSQL=false&useLegacyDatetimeCode=false&serverTimezone=UTC"
- + "&nullCatalogMeansCurrent=true&nullNamePatternMatchesAll=true" );
+ + "&nullCatalogMeansCurrent=true&nullNamePatternMatchesAll=true&useSSL=false" );
defaults.driver().set( "com.mysql.jdbc.Driver" );
defaults.enabled().set( true );
defaults.username().set( "root" );
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c11e9c2d/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MySQLEntityStoreTest.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MySQLEntityStoreTest.java b/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MySQLEntityStoreTest.java
index 0baf331..72f0df0 100644
--- a/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MySQLEntityStoreTest.java
+++ b/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MySQLEntityStoreTest.java
@@ -25,7 +25,6 @@ import com.github.junit5docker.Port;
import com.github.junit5docker.WaitFor;
import java.lang.reflect.UndeclaredThrowableException;
import org.apache.polygene.api.common.Visibility;
-import org.apache.polygene.bootstrap.AssemblyException;
import org.apache.polygene.bootstrap.ModuleAssembly;
import org.apache.polygene.entitystore.sql.assembly.MySQLEntityStoreAssembler;
import org.apache.polygene.library.sql.assembly.DataSourceAssembler;
@@ -37,30 +36,24 @@ import org.jooq.SQLDialect;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
-@Docker( image = "mysql:8.0.11",
+// If upgrade to MySQL 8, then these tests will fail due to some new authentication requirements.
+@Docker( image = "mysql:5.7.22",
ports = @Port( exposed = 8801, inner = 3306 ),
environments = {
@Environment( key = "MYSQL_ROOT_PASSWORD", value = "" ),
@Environment( key = "MYSQL_ALLOW_EMPTY_PASSWORD", value = "yes" ),
@Environment( key = "MYSQL_DATABASE", value = "jdbc_test_db" )
},
- waitFor = @WaitFor( value = "mysqld: ready for connections", timeoutInMillis = 40000 ),
+ waitFor = @WaitFor( value = "ready for connections", timeoutInMillis = 90000 ),
newForEachCase = false
)
-public class MySQLEntityStoreTest
- extends AbstractEntityStoreTest
+public class MySQLEntityStoreTest extends AbstractEntityStoreTest
{
@BeforeAll
- public static void waitForDockerToSettle()
+ static void waitForDockerToSettle()
+ throws Exception
{
- try
- {
- Thread.sleep( 10000 );
- }
- catch( InterruptedException e )
- {
- throw new UndeclaredThrowableException( e );
- }
+ Thread.sleep( 30000 );
}
@Override
@@ -100,7 +93,7 @@ public class MySQLEntityStoreTest
DataSourceConfiguration defaults = config.forMixin( DataSourceConfiguration.class ).declareDefaults();
defaults.url().set( "jdbc:mysql://" + mysqlHost + ":" + mysqlPort
+ "/jdbc_test_db?profileSQL=false&useLegacyDatetimeCode=false&serverTimezone=UTC"
- + "&nullCatalogMeansCurrent=true&nullNamePatternMatchesAll=true" );
+ + "&nullCatalogMeansCurrent=true&nullNamePatternMatchesAll=true&useSSL=false" );
defaults.driver().set( "com.mysql.jdbc.Driver" );
defaults.enabled().set( true );
defaults.username().set( "root" );
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c11e9c2d/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MySQLEntityStoreTestSuite.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MySQLEntityStoreTestSuite.java b/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MySQLEntityStoreTestSuite.java
index a2edb33..a84ac74 100644
--- a/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MySQLEntityStoreTestSuite.java
+++ b/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MySQLEntityStoreTestSuite.java
@@ -23,7 +23,6 @@ import com.github.junit5docker.Docker;
import com.github.junit5docker.Environment;
import com.github.junit5docker.Port;
import com.github.junit5docker.WaitFor;
-import java.lang.reflect.UndeclaredThrowableException;
import org.apache.polygene.api.common.Visibility;
import org.apache.polygene.bootstrap.ModuleAssembly;
import org.apache.polygene.entitystore.sql.assembly.MySQLEntityStoreAssembler;
@@ -35,7 +34,8 @@ import org.jooq.SQLDialect;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
-@Docker( image = "mysql:8.0.11",
+// If upgrade to MySQL 8, then these tests will fail due to some new authentication requirements.
+@Docker( image = "mysql:5.7.22",
ports = @Port( exposed = 8801, inner = 3306 ),
environments = {
@Environment( key = "MYSQL_ROOT_PASSWORD", value = "" ),
@@ -48,16 +48,10 @@ import org.junit.jupiter.api.BeforeAll;
public class MySQLEntityStoreTestSuite extends EntityStoreTestSuite
{
@BeforeAll
- public static void waitForDockerToSettle()
+ static void waitForDockerToSettle()
+ throws Exception
{
- try
- {
- Thread.sleep( 12000 );
- }
- catch( InterruptedException e )
- {
- throw new UndeclaredThrowableException( e );
- }
+ Thread.sleep( 12000 );
}
@Override
@@ -90,7 +84,7 @@ public class MySQLEntityStoreTestSuite extends EntityStoreTestSuite
DataSourceConfiguration defaults = configModule.forMixin( DataSourceConfiguration.class ).declareDefaults();
defaults.url().set( "jdbc:mysql://" + mysqlHost + ":" + mysqlPort
+ "/jdbc_test_db?profileSQL=false&useLegacyDatetimeCode=false&serverTimezone=UTC"
- + "&nullCatalogMeansCurrent=true&nullNamePatternMatchesAll=true" );
+ + "&nullCatalogMeansCurrent=true&nullNamePatternMatchesAll=true&useSSL=false" );
defaults.driver().set( "com.mysql.jdbc.Driver" );
defaults.enabled().set( true );
defaults.username().set( "root" );
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c11e9c2d/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTest.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTest.java b/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTest.java
index e88305e..421d5e2 100644
--- a/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTest.java
+++ b/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTest.java
@@ -24,7 +24,6 @@ import com.github.junit5docker.Environment;
import com.github.junit5docker.Port;
import com.github.junit5docker.WaitFor;
import org.apache.polygene.api.common.Visibility;
-import org.apache.polygene.bootstrap.AssemblyException;
import org.apache.polygene.bootstrap.ModuleAssembly;
import org.apache.polygene.entitystore.sqlkv.assembly.MySQLEntityStoreAssembler;
import org.apache.polygene.library.sql.assembly.DataSourceAssembler;
@@ -34,20 +33,27 @@ import org.apache.polygene.test.EntityTestAssembler;
import org.apache.polygene.test.entity.AbstractEntityStoreTest;
import org.jooq.SQLDialect;
import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.BeforeAll;
@Docker( image = "mariadb:10.1.21",
- ports = @Port( exposed = 8801, inner = 3306),
+ ports = @Port( exposed = 8801, inner = 3306 ),
environments = {
- @Environment( key = "MYSQL_ROOT_PASSWORD", value = ""),
- @Environment(key = "MYSQL_ALLOW_EMPTY_PASSWORD", value = "yes"),
- @Environment(key = "MYSQL_DATABASE", value = "jdbc_test_db"),
+ @Environment( key = "MYSQL_ROOT_PASSWORD", value = "" ),
+ @Environment( key = "MYSQL_ALLOW_EMPTY_PASSWORD", value = "yes" ),
+ @Environment( key = "MYSQL_DATABASE", value = "jdbc_test_db" ),
},
- waitFor = @WaitFor( value = "mysqld: ready for connections",timeoutInMillis = 30000),
+ waitFor = @WaitFor( value = "mysqld: ready for connections", timeoutInMillis = 120000 ),
newForEachCase = false
)
public class MariaDbEntityStoreTest extends AbstractEntityStoreTest
{
+ @BeforeAll
+ static void waitForDockerToSettle()
+ throws Exception
+ {
+ Thread.sleep( 15000L );
+ }
+
@Override
// START SNIPPET: assembly
public void assemble( ModuleAssembly module )
@@ -85,7 +91,7 @@ public class MariaDbEntityStoreTest extends AbstractEntityStoreTest
config.forMixin( DataSourceConfiguration.class ).declareDefaults()
.url().set( "jdbc:mysql://" + mysqlHost + ":" + mysqlPort
+ "/jdbc_test_db?profileSQL=false&useLegacyDatetimeCode=false&serverTimezone=UTC"
- + "&nullCatalogMeansCurrent=true&nullNamePatternMatchesAll=true" );
+ + "&nullCatalogMeansCurrent=true&nullNamePatternMatchesAll=true&useSSL=false" );
// START SNIPPET: assembly
}
// END SNIPPET: assembly
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c11e9c2d/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTestSuite.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTestSuite.java b/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTestSuite.java
index f7e814c..6a1c125 100644
--- a/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTestSuite.java
+++ b/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTestSuite.java
@@ -32,6 +32,7 @@ import org.apache.polygene.library.sql.dbcp.DBCPDataSourceServiceAssembler;
import org.apache.polygene.test.entity.model.EntityStoreTestSuite;
import org.jooq.SQLDialect;
import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
@Docker( image = "mariadb:10.1.21",
@@ -41,11 +42,18 @@ import org.junit.jupiter.api.Disabled;
@Environment(key = "MYSQL_ALLOW_EMPTY_PASSWORD", value = "yes"),
@Environment(key = "MYSQL_DATABASE", value = "jdbc_test_db"),
},
- waitFor = @WaitFor( value = "mysqld: ready for connections", timeoutInMillis = 30000),
+ waitFor = @WaitFor( value = "mysqld: ready for connections", timeoutInMillis = 120000),
newForEachCase = false
)
public class MariaDbEntityStoreTestSuite extends EntityStoreTestSuite
{
+ @BeforeAll
+ static void waitForDockerToSettle()
+ throws Exception
+ {
+ Thread.sleep( 15000L );
+ }
+
@Override
protected void defineStorageModule( ModuleAssembly module )
{
@@ -76,7 +84,7 @@ public class MariaDbEntityStoreTestSuite extends EntityStoreTestSuite
configModule.forMixin( DataSourceConfiguration.class ).declareDefaults()
.url().set( "jdbc:mysql://" + mysqlHost + ":" + mysqlPort
+ "/jdbc_test_db?profileSQL=false&useLegacyDatetimeCode=false&serverTimezone=UTC"
- + "&nullCatalogMeansCurrent=true&nullNamePatternMatchesAll=true" );
+ + "&nullCatalogMeansCurrent=true&nullNamePatternMatchesAll=true&useSSL=false" );
}
@Override
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c11e9c2d/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MySQLEntityStoreTest.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MySQLEntityStoreTest.java b/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MySQLEntityStoreTest.java
index 5df3ef0..bdad6b0 100644
--- a/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MySQLEntityStoreTest.java
+++ b/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MySQLEntityStoreTest.java
@@ -34,20 +34,28 @@ import org.apache.polygene.test.EntityTestAssembler;
import org.apache.polygene.test.entity.AbstractEntityStoreTest;
import org.jooq.SQLDialect;
import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
-@Docker( image = "mysql:8.0.11",
+@Docker( image = "mysql:5.7.22",
ports = @Port( exposed = 8801, inner = 3306),
environments = {
@Environment( key = "MYSQL_ROOT_PASSWORD", value = ""),
@Environment(key = "MYSQL_ALLOW_EMPTY_PASSWORD", value = "yes"),
@Environment(key = "MYSQL_DATABASE", value = "jdbc_test_db"),
},
- waitFor = @WaitFor( value = "mysqld: ready for connections", timeoutInMillis = 30000),
+ waitFor = @WaitFor( value = "mysqld: ready for connections", timeoutInMillis = 90000),
newForEachCase = false
)
public class MySQLEntityStoreTest extends AbstractEntityStoreTest
{
+ @BeforeAll
+ static void waitForDockerToSettle()
+ throws Exception
+ {
+ Thread.sleep( 15000 );
+ }
+
@Override
// START SNIPPET: assembly
public void assemble( ModuleAssembly module )
@@ -85,7 +93,7 @@ public class MySQLEntityStoreTest extends AbstractEntityStoreTest
config.forMixin( DataSourceConfiguration.class ).declareDefaults()
.url().set( "jdbc:mysql://" + mysqlHost + ":" + mysqlPort
+ "/jdbc_test_db?profileSQL=false&useLegacyDatetimeCode=false&serverTimezone=UTC"
- + "&nullCatalogMeansCurrent=true&nullNamePatternMatchesAll=true" );
+ + "&nullCatalogMeansCurrent=true&nullNamePatternMatchesAll=true&useSSL=false" );
// START SNIPPET: assembly
}
// END SNIPPET: assembly
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c11e9c2d/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MySQLEntityStoreTestSuite.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MySQLEntityStoreTestSuite.java b/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MySQLEntityStoreTestSuite.java
index 8a99ab9..a6b5aa6 100644
--- a/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MySQLEntityStoreTestSuite.java
+++ b/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MySQLEntityStoreTestSuite.java
@@ -32,20 +32,28 @@ import org.apache.polygene.library.sql.dbcp.DBCPDataSourceServiceAssembler;
import org.apache.polygene.test.entity.model.EntityStoreTestSuite;
import org.jooq.SQLDialect;
import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
-@Docker( image = "mysql:8.0.11",
+@Docker( image = "mysql:5.7.22",
ports = @Port( exposed = 8801, inner = 3306),
environments = {
@Environment( key = "MYSQL_ROOT_PASSWORD", value = ""),
@Environment(key = "MYSQL_ALLOW_EMPTY_PASSWORD", value = "yes"),
@Environment(key = "MYSQL_DATABASE", value = "jdbc_test_db"),
},
- waitFor = @WaitFor( value = "mysqld: ready for connections", timeoutInMillis = 30000),
+ waitFor = @WaitFor( value = "mysqld: ready for connections", timeoutInMillis = 90000),
newForEachCase = false
)
public class MySQLEntityStoreTestSuite extends EntityStoreTestSuite
{
+ @BeforeAll
+ static void waitForDockerToSettle()
+ throws Exception
+ {
+ Thread.sleep( 15000 );
+ }
+
@Override
protected void defineStorageModule( ModuleAssembly module )
{
@@ -76,7 +84,7 @@ public class MySQLEntityStoreTestSuite extends EntityStoreTestSuite
configModule.forMixin( DataSourceConfiguration.class ).declareDefaults()
.url().set( "jdbc:mysql://" + mysqlHost + ":" + mysqlPort
+ "/jdbc_test_db?profileSQL=false&useLegacyDatetimeCode=false&serverTimezone=UTC"
- + "&nullCatalogMeansCurrent=true&nullNamePatternMatchesAll=true" );
+ + "&nullCatalogMeansCurrent=true&nullNamePatternMatchesAll=true&useSSL=false" );
}
@Override