Improve waiting strategy for SMB test container

Author: jozala

x-pack/test/smb-fixture/src/main/java/org/elasticsearch/test/fixtures/smb/SmbTestContainer.java

@@ -11,6 +11,7 @@
 
 import org.elasticsearch.test.fixtures.testcontainers.DockerEnvironmentAwareTestContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
 import org.testcontainers.images.builder.ImageFromDockerfile;
 
 public final class SmbTestContainer extends DockerEnvironmentAwareTestContainer {
@@ -44,7 +45,11 @@ public SmbTestContainer() {
         addExposedPort(AD_LDAP_PORT);
         addExposedPort(AD_LDAP_GC_PORT);
 
-        setWaitStrategy(Wait.forLogMessage(".*Samba started.*", 1));
+        setWaitStrategy(
+            new WaitAllStrategy()
+                .withStrategy(Wait.forLogMessage(".*Samba started.*", 1))
+                .withStrategy(Wait.forListeningPort())
+        );
 
         getCreateContainerCmdModifiers().add(createContainerCmd -> {
             createContainerCmd.getHostConfig().withCapAdd(Capability.SYS_ADMIN);