Merge pull request #593 from gruelbox/reuse-containers

Re-use containers
gruelbox · Mar 21, 2024 · d07bb2e · d07bb2e
2 parents 5012cec + ea3077f
commit d07bb2e
Show file tree

Hide file tree

Showing 17 changed files with 35 additions and 9 deletions.
diff --git a/...outbox-acceptance/src/test/java/com/gruelbox/transactionoutbox/acceptance/TestMySql5.java b/...outbox-acceptance/src/test/java/com/gruelbox/transactionoutbox/acceptance/TestMySql5.java
@@ -18,6 +18,7 @@ class TestMySql5 extends AbstractAcceptanceTest {
   private static final JdbcDatabaseContainer container =
       new MySQLContainer<>("mysql:5")
           .withStartupTimeout(Duration.ofMinutes(5))
+          .withReuse(true)
           .withTmpFs(Map.of("/var/lib/mysql", "rw"));
 
   @Override

diff --git a/...outbox-acceptance/src/test/java/com/gruelbox/transactionoutbox/acceptance/TestMySql8.java b/...outbox-acceptance/src/test/java/com/gruelbox/transactionoutbox/acceptance/TestMySql8.java
@@ -18,6 +18,7 @@ class TestMySql8 extends AbstractAcceptanceTest {
   private static final JdbcDatabaseContainer container =
       new MySQLContainer<>("mysql:8")
           .withStartupTimeout(Duration.ofMinutes(5))
+          .withReuse(true)
           .withTmpFs(Map.of("/var/lib/mysql", "rw"));
 
   @Override

diff --git a/...ox-acceptance/src/test/java/com/gruelbox/transactionoutbox/acceptance/TestPostgres11.java b/...ox-acceptance/src/test/java/com/gruelbox/transactionoutbox/acceptance/TestPostgres11.java
@@ -16,7 +16,9 @@ class TestPostgres11 extends AbstractAcceptanceTest {
   @SuppressWarnings({"rawtypes", "resource"})
   private static final JdbcDatabaseContainer container =
       (JdbcDatabaseContainer)
-          new PostgreSQLContainer("postgres:11").withStartupTimeout(Duration.ofHours(1));
+          new PostgreSQLContainer("postgres:11")
+              .withStartupTimeout(Duration.ofHours(1))
+              .withReuse(true);
 
   @Override
   protected ConnectionDetails connectionDetails() {

diff --git a/...ox-acceptance/src/test/java/com/gruelbox/transactionoutbox/acceptance/TestPostgres12.java b/...ox-acceptance/src/test/java/com/gruelbox/transactionoutbox/acceptance/TestPostgres12.java
@@ -16,7 +16,9 @@ class TestPostgres12 extends AbstractAcceptanceTest {
   @SuppressWarnings({"rawtypes", "resource"})
   private static final JdbcDatabaseContainer container =
       (JdbcDatabaseContainer)
-          new PostgreSQLContainer("postgres:12").withStartupTimeout(Duration.ofHours(1));
+          new PostgreSQLContainer("postgres:12")
+              .withStartupTimeout(Duration.ofHours(1))
+              .withReuse(true);
 
   @Override
   protected ConnectionDetails connectionDetails() {

diff --git a/...ox-acceptance/src/test/java/com/gruelbox/transactionoutbox/acceptance/TestPostgres13.java b/...ox-acceptance/src/test/java/com/gruelbox/transactionoutbox/acceptance/TestPostgres13.java
@@ -16,7 +16,9 @@ class TestPostgres13 extends AbstractAcceptanceTest {
   @SuppressWarnings({"rawtypes", "resource"})
   private static final JdbcDatabaseContainer container =
       (JdbcDatabaseContainer)
-          new PostgreSQLContainer("postgres:13").withStartupTimeout(Duration.ofHours(1));
+          new PostgreSQLContainer("postgres:13")
+              .withStartupTimeout(Duration.ofHours(1))
+              .withReuse(true);
 
   @Override
   protected ConnectionDetails connectionDetails() {

diff --git a/...ox-acceptance/src/test/java/com/gruelbox/transactionoutbox/acceptance/TestPostgres14.java b/...ox-acceptance/src/test/java/com/gruelbox/transactionoutbox/acceptance/TestPostgres14.java
@@ -16,7 +16,9 @@ class TestPostgres14 extends AbstractAcceptanceTest {
   @SuppressWarnings({"rawtypes", "resource"})
   private static final JdbcDatabaseContainer container =
       (JdbcDatabaseContainer)
-          new PostgreSQLContainer("postgres:14").withStartupTimeout(Duration.ofHours(1));
+          new PostgreSQLContainer("postgres:14")
+              .withStartupTimeout(Duration.ofHours(1))
+              .withReuse(true);
 
   @Override
   protected ConnectionDetails connectionDetails() {

diff --git a/...ox-acceptance/src/test/java/com/gruelbox/transactionoutbox/acceptance/TestPostgres15.java b/...ox-acceptance/src/test/java/com/gruelbox/transactionoutbox/acceptance/TestPostgres15.java
@@ -16,7 +16,9 @@ class TestPostgres15 extends AbstractAcceptanceTest {
   @SuppressWarnings({"rawtypes", "resource"})
   private static final JdbcDatabaseContainer container =
       (JdbcDatabaseContainer)
-          new PostgreSQLContainer("postgres:15").withStartupTimeout(Duration.ofHours(1));
+          new PostgreSQLContainer("postgres:15")
+              .withStartupTimeout(Duration.ofHours(1))
+              .withReuse(true);
 
   @Override
   protected ConnectionDetails connectionDetails() {

diff --git a/...ox-acceptance/src/test/java/com/gruelbox/transactionoutbox/acceptance/TestPostgres16.java b/...ox-acceptance/src/test/java/com/gruelbox/transactionoutbox/acceptance/TestPostgres16.java
@@ -16,7 +16,9 @@ class TestPostgres16 extends AbstractAcceptanceTest {
   @SuppressWarnings({"rawtypes", "resource"})
   private static final JdbcDatabaseContainer container =
       (JdbcDatabaseContainer)
-          new PostgreSQLContainer("postgres:16").withStartupTimeout(Duration.ofHours(1));
+          new PostgreSQLContainer("postgres:16")
+              .withStartupTimeout(Duration.ofHours(1))
+              .withReuse(true);
 
   @Override
   protected ConnectionDetails connectionDetails() {

diff --git a/.../java/com/gruelbox/transactionoutbox/acceptance/persistor/TestDefaultPersistorMySql5.java b/.../java/com/gruelbox/transactionoutbox/acceptance/persistor/TestDefaultPersistorMySql5.java
@@ -19,6 +19,7 @@ class TestDefaultPersistorMySql5 extends AbstractPersistorTest {
   private static final JdbcDatabaseContainer container =
       new MySQLContainer<>("mysql:5")
           .withStartupTimeout(Duration.ofMinutes(5))
+          .withReuse(true)
           .withTmpFs(Map.of("/var/lib/mysql", "rw"));
 
   private final DefaultPersistor persistor =

diff --git a/.../java/com/gruelbox/transactionoutbox/acceptance/persistor/TestDefaultPersistorMySql8.java b/.../java/com/gruelbox/transactionoutbox/acceptance/persistor/TestDefaultPersistorMySql8.java
@@ -19,6 +19,7 @@ class TestDefaultPersistorMySql8 extends AbstractPersistorTest {
   private static final JdbcDatabaseContainer container =
       new MySQLContainer<>("mysql:8")
           .withStartupTimeout(Duration.ofMinutes(5))
+          .withReuse(true)
           .withTmpFs(Map.of("/var/lib/mysql", "rw"));
 
   private final DefaultPersistor persistor =

diff --git a/...a/com/gruelbox/transactionoutbox/acceptance/persistor/TestDefaultPersistorPostgres16.java b/...a/com/gruelbox/transactionoutbox/acceptance/persistor/TestDefaultPersistorPostgres16.java
@@ -17,7 +17,9 @@ class TestDefaultPersistorPostgres16 extends AbstractPersistorTest {
   @SuppressWarnings({"rawtypes", "resource"})
   private static final JdbcDatabaseContainer container =
       (JdbcDatabaseContainer)
-          new PostgreSQLContainer("postgres:16").withStartupTimeout(Duration.ofHours(1));
+          new PostgreSQLContainer("postgres:16")
+              .withStartupTimeout(Duration.ofHours(1))
+              .withReuse(true);
 
   private final DefaultPersistor persistor =
       DefaultPersistor.builder().dialect(Dialect.POSTGRESQL_9).build();

diff --git a/...c/test/java/com/gruelbox/transactionoutbox/jooq/acceptance/TestJooqThreadLocalMySql5.java b/...c/test/java/com/gruelbox/transactionoutbox/jooq/acceptance/TestJooqThreadLocalMySql5.java
@@ -20,6 +20,7 @@ class TestJooqThreadLocalMySql5 extends AbstractJooqAcceptanceThreadLocalTest {
       (JdbcDatabaseContainer<?>)
           new MySQLContainer("mysql:5")
               .withStartupTimeout(Duration.ofMinutes(5))
+              .withReuse(true)
               .withTmpFs(Map.of("/var/lib/mysql", "rw"));
 
   @Override

diff --git a/...c/test/java/com/gruelbox/transactionoutbox/jooq/acceptance/TestJooqThreadLocalMySql8.java b/...c/test/java/com/gruelbox/transactionoutbox/jooq/acceptance/TestJooqThreadLocalMySql8.java
@@ -20,6 +20,7 @@ class TestJooqThreadLocalMySql8 extends AbstractJooqAcceptanceThreadLocalTest {
       (JdbcDatabaseContainer<?>)
           new MySQLContainer("mysql:8")
               .withStartupTimeout(Duration.ofMinutes(5))
+              .withReuse(true)
               .withTmpFs(Map.of("/var/lib/mysql", "rw"));
 
   @Override

diff --git a/...st/java/com/gruelbox/transactionoutbox/jooq/acceptance/TestJooqThreadLocalPostgres16.java b/...st/java/com/gruelbox/transactionoutbox/jooq/acceptance/TestJooqThreadLocalPostgres16.java
@@ -17,7 +17,9 @@ class TestJooqThreadLocalPostgres16 extends AbstractJooqAcceptanceThreadLocalTes
   @SuppressWarnings({"rawtypes", "resource"})
   private static final JdbcDatabaseContainer container =
       (JdbcDatabaseContainer)
-          new PostgreSQLContainer("postgres:16").withStartupTimeout(Duration.ofHours(1));
+          new PostgreSQLContainer("postgres:16")
+              .withStartupTimeout(Duration.ofHours(1))
+              .withReuse(true);
 
   @Override
   protected ConnectionDetails connectionDetails() {

diff --git a/...ds/src/test/java/com/gruelbox/transactionoutbox/virtthreads/TestVirtualThreadsMySql5.java b/...ds/src/test/java/com/gruelbox/transactionoutbox/virtthreads/TestVirtualThreadsMySql5.java
@@ -20,6 +20,7 @@ class TestVirtualThreadsMySql5 extends AbstractVirtualThreadsTest {
   private static final JdbcDatabaseContainer container =
       new MySQLContainer<>("mysql:5")
           .withStartupTimeout(Duration.ofMinutes(5))
+          .withReuse(true)
           .withTmpFs(Map.of("/var/lib/mysql", "rw"));
 
   @Override

diff --git a/...ds/src/test/java/com/gruelbox/transactionoutbox/virtthreads/TestVirtualThreadsMySql8.java b/...ds/src/test/java/com/gruelbox/transactionoutbox/virtthreads/TestVirtualThreadsMySql8.java
@@ -20,6 +20,7 @@ class TestVirtualThreadsMySql8 extends AbstractVirtualThreadsTest {
   private static final JdbcDatabaseContainer container =
       new MySQLContainer<>("mysql:8")
           .withStartupTimeout(Duration.ofMinutes(5))
+          .withReuse(true)
           .withTmpFs(Map.of("/var/lib/mysql", "rw"));
 
   @Override

diff --git a/...rc/test/java/com/gruelbox/transactionoutbox/virtthreads/TestVirtualThreadsPostgres16.java b/...rc/test/java/com/gruelbox/transactionoutbox/virtthreads/TestVirtualThreadsPostgres16.java
@@ -16,7 +16,9 @@ class TestVirtualThreadsPostgres16 extends AbstractVirtualThreadsTest {
   @SuppressWarnings({"rawtypes", "resource"})
   private static final JdbcDatabaseContainer container =
       (JdbcDatabaseContainer)
-          new PostgreSQLContainer("postgres:16").withStartupTimeout(Duration.ofHours(1));
+          new PostgreSQLContainer("postgres:16")
+              .withStartupTimeout(Duration.ofHours(1))
+              .withReuse(true);
 
   @Override
   protected ConnectionDetails connectionDetails() {