From 876aae986c562952f885908e1e5a3c6a490ea2ef Mon Sep 17 00:00:00 2001
From: Mark Terry <mark.terry@consensys.net>
Date: Wed, 10 Feb 2021 08:45:22 +1000
Subject: [PATCH] Container base fix

Signed-off-by: Mark Terry <mark.terry@consensys.net>
---
 .../container/{TestContainerTest.java => ContainerTest.java}   | 2 +-
 .../{TestContainersTestBase.java => ContainerTestBase.java}    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename container-tests/tests/src/test/java/org/hyperledger/besu/tests/container/{TestContainerTest.java => ContainerTest.java} (74%)
 rename container-tests/tests/src/test/java/org/hyperledger/besu/tests/container/{TestContainersTestBase.java => ContainerTestBase.java} (99%)

diff --git a/container-tests/tests/src/test/java/org/hyperledger/besu/tests/container/TestContainerTest.java b/container-tests/tests/src/test/java/org/hyperledger/besu/tests/container/ContainerTest.java
similarity index 74%
rename from container-tests/tests/src/test/java/org/hyperledger/besu/tests/container/TestContainerTest.java
rename to container-tests/tests/src/test/java/org/hyperledger/besu/tests/container/ContainerTest.java
index aab42ff81df..202d12f85a6 100644
--- a/container-tests/tests/src/test/java/org/hyperledger/besu/tests/container/TestContainerTest.java
+++ b/container-tests/tests/src/test/java/org/hyperledger/besu/tests/container/ContainerTest.java
@@ -3,7 +3,7 @@
 import org.assertj.core.api.Assertions;
 import org.junit.Test;
 
-public class TestContainerTest extends TestContainersTestBase {
+public class ContainerTest extends ContainerTestBase {
 
   @Test
   public void test() {
diff --git a/container-tests/tests/src/test/java/org/hyperledger/besu/tests/container/TestContainersTestBase.java b/container-tests/tests/src/test/java/org/hyperledger/besu/tests/container/ContainerTestBase.java
similarity index 99%
rename from container-tests/tests/src/test/java/org/hyperledger/besu/tests/container/TestContainersTestBase.java
rename to container-tests/tests/src/test/java/org/hyperledger/besu/tests/container/ContainerTestBase.java
index 32b1c24b239..dcd4d724b58 100644
--- a/container-tests/tests/src/test/java/org/hyperledger/besu/tests/container/TestContainersTestBase.java
+++ b/container-tests/tests/src/test/java/org/hyperledger/besu/tests/container/ContainerTestBase.java
@@ -33,7 +33,7 @@
 import org.web3j.protocol.http.HttpService;
 
 @SuppressWarnings({"rawtypes", "unchecked"})
-public class TestContainersTestBase {
+public class ContainerTestBase {
   private final Network containerNetwork = Network.SHARED;
   private final String besuVersion = "20.10.3";
   private final String goQuorumVersion = "21.1";
@@ -107,6 +107,7 @@ public class TestContainersTestBase {
               "-o keys.keyData[0].privateKeyPath=" + tesseraContainerPrivKeyPath,
               "-o keys.keyData[0].publicKeyPath=" + tesseraContainerPubKeyPath)
           .withExposedPorts(tesseraRestPort)
+          .withStartupAttempts(5)
           .withStartupCheckStrategy(
               new MinimumDurationRunningStartupCheckStrategy(Duration.ofSeconds(10)));