Improve WaitAllStrategy.

[michael-simons]

This is a PR addressing #1269.

I have split it up into two commits:

1. Remove deprecations from the WaitAllStrategyTest (don't test deprecated but current classes, update references to Moskitos argument matchers), can be cherry picked.
2. Change the behaviour of WaitAllStrategy: It now pushes down it's own timeout to all children. I have added then additional tests respectively removed the own using a mock.

[kiview]

Do we have a race conditions in the tests, that is happening on CI? Looks like this on CirlceCI and Travis was hanging. I retriggered both.

[michael-simons]

Hmm, @kiview I added tests with timeouts not longer than 20 milliseconds. If they hang, that would be somewhere deeper.

Maybe CI hang because I forced push onto this branch?

[rnorth]

I've retriggered the CI jobs - let's see...

[rnorth]

I've rerun the build several times but it's looking like it's always getting stuck here:

Gradle Test Executor 1 > org.testcontainers.junit.DockerComposeWaitStrategyTest > testWaitingFails STARTED
Too long with no output (exceeded 10m0s)

Given that this test involves wait strategies too, I get the feeling that there's something broken. I've not had time to dig into what, just yet.

[michael-simons]

That would be this one, right?

testcontainers-java/core/src/test/java/org/testcontainers/junit/DockerComposeWaitStrategyTest.java

Line 45 in f113979

public void testWaitingFails() {

Does it involve the WaitAllStrategy at all?
This is my main change:
https://github.com/testcontainers/testcontainers-java/pull/1272/files#diff-7b2fedcd67314c538c802560f884fc52R31

[michael-simons]

Oh yes it does indeed:
https://github.com/testcontainers/testcontainers-java/blob/master/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java#L334

The newly created WaitAllStrategy pushes down it's 30 minutes wait them now to the wait strategy passed on the method.
Yeah, that's the expected outcome of my change.

So that "hang" could be fixed by fixing https://github.com/testcontainers/testcontainers-java/blob/master/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java#L334 which could need some improvement IMHO. The logic described in the comment feels wrong.
What happens if I even pass in a WaitAll for a composed container?

Have to think about that for a bit.
Is there a chance that @bsideup or @kiview are in JavaLand next week? We could discuss this there…

[kiview]

@michael-simons Yes I will be at Javaland, would be cool to look into this together and maybe hack on it :)

[michael-simons]

Hi @kiview. Here’s the change as discussed in JavaLand. It took the longest time to think about names.

If you want to make sure that wait all times out when using individual timeouts I’d suggest using another enclosing strategy instead of mixing those concerns.

Apart from that, I rebased on master.

[michael-simons]

Or, if you prefer a failsafe, that could be another mode, that doesn’t do the check on changing timeouts and doesn’t push down the timeouts to the inner strategies. I could add this as well.

While thinking about it: would be a nice solution in the end.

[michael-simons]

That should cover now all the modes.

[kiview]

Re-triggered Circle-CI, it seems this was something during dependency download.

[kiview]

@rnorth @bsideup
@michael-simons and me discussed this PR at Javaland and we thought this new change (although it changes the default behavior) is more in line of what a user is actually expecting from the GenericContainer.withStartupTimeout() method.

In the current implementation, a user won't be able to use GenericContainer.withStartupTimeout() with containers that already implement a more sophisticated waiting strategy (e.g. BrowserWebDriverContainer, which will always apply the inner LogMessageWaitStrategy timeout).

So while we are breaking the default behavior here, I'm in favor of doing it.
As an alternative, we can keep the default as is and just add the configurability part from this PR.

[kiview]

Merged, thanks to @michael-simons :)

[rnorth]

Released in 1.11.2!