From fa588d8948c174b1ec18ab10e82c577258a12684 Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Tue, 13 Jul 2021 18:08:25 +0300
Subject: [PATCH] Black box tests startup improvements

---
 msa/black-box-tests/pom.xml                   |  2 +-
 .../server/msa/ContainerTestSuite.java        | 35 +++++++++++++------
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/msa/black-box-tests/pom.xml b/msa/black-box-tests/pom.xml
index 68331569ab..5c6740e61d 100644
--- a/msa/black-box-tests/pom.xml
+++ b/msa/black-box-tests/pom.xml
@@ -35,7 +35,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <main.dir>${basedir}/../..</main.dir>
         <blackBoxTests.skip>true</blackBoxTests.skip>
-        <testcontainers.version>1.9.1</testcontainers.version>
+        <testcontainers.version>1.11.4</testcontainers.version>
         <zeroturnaround.version>1.10</zeroturnaround.version>
         <httpclient.version>4.5.13</httpclient.version>
     </properties>
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java
index acaf417882..c5abbe864b 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java
@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.msa;
 
+import lombok.extern.slf4j.Slf4j;
 import org.junit.ClassRule;
 import org.junit.extensions.cpsuite.ClasspathSuite;
 import org.junit.rules.ExternalResource;
@@ -32,6 +33,7 @@ import java.util.Map;
 
 @RunWith(ClasspathSuite.class)
 @ClasspathSuite.ClassnameFilters({"org.thingsboard.server.msa.*Test"})
+@Slf4j
 public class ContainerTestSuite {
 
     private static DockerComposeContainer<?> testContainer;
@@ -43,17 +45,28 @@ public class ContainerTestSuite {
     public static DockerComposeContainer getTestContainer() {
         if (testContainer == null) {
             boolean skipTailChildContainers = Boolean.valueOf(System.getProperty("blackBoxTests.skipTailChildContainers"));
-            testContainer = new DockerComposeContainer<>(
-                    new File("./../../docker/docker-compose.yml"),
-                    new File("./../../docker/docker-compose.postgres.yml"),
-                    new File("./../../docker/docker-compose.postgres.volumes.yml"),
-                    new File("./../../docker/docker-compose.kafka.yml"))
-                    .withPull(false)
-                    .withLocalCompose(true)
-                    .withTailChildContainers(!skipTailChildContainers)
-                    .withEnv(installTb.getEnv())
-                    .withEnv("LOAD_BALANCER_NAME", "")
-                    .withExposedService("haproxy", 80, Wait.forHttp("/swagger-ui.html").withStartupTimeout(Duration.ofSeconds(400)));
+            try {
+                String logRegexp = ".*Going to recalculate partitions.*";
+
+                testContainer = new DockerComposeContainer<>(
+                        new File("./../../docker/docker-compose.yml"),
+                        new File("./../../docker/docker-compose.postgres.yml"),
+                        new File("./../../docker/docker-compose.postgres.volumes.yml"),
+                        new File("./../../docker/docker-compose.kafka.yml"))
+                        .withPull(false)
+                        .withLocalCompose(true)
+                        .withTailChildContainers(!skipTailChildContainers)
+                        .withEnv(installTb.getEnv())
+                        .withEnv("LOAD_BALANCER_NAME", "")
+                        .withExposedService("haproxy", 80, Wait.forHttp("/swagger-ui.html").withStartupTimeout(Duration.ofSeconds(400)))
+                        .waitingFor("tb-http-transport1", Wait.forLogMessage(logRegexp, 1).withStartupTimeout(Duration.ofSeconds(400)))
+                        .waitingFor("tb-http-transport2", Wait.forLogMessage(logRegexp, 1).withStartupTimeout(Duration.ofSeconds(400)))
+                        .waitingFor("tb-mqtt-transport1", Wait.forLogMessage(logRegexp, 1).withStartupTimeout(Duration.ofSeconds(400)))
+                        .waitingFor("tb-mqtt-transport2", Wait.forLogMessage(logRegexp, 1).withStartupTimeout(Duration.ofSeconds(400)));
+            } catch (Exception e) {
+                log.error("Failed to create test container", e);
+                throw e;
+            }
         }
         return testContainer;
     }