Skip to content

Commit

Permalink
Refs #1769: mark toxiproxy tests as flaky pending further analysis (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
rnorth committed Aug 23, 2019
1 parent 62d646a commit 2d1df16
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
2 changes: 2 additions & 0 deletions modules/toxiproxy/build.gradle
Expand Up @@ -6,4 +6,6 @@ dependencies {

testCompile 'redis.clients:jedis:3.0.1'
testCompile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'

testCompile project(':test-support')
}
Expand Up @@ -3,6 +3,8 @@
import eu.rekawek.toxiproxy.model.ToxicDirection;
import org.junit.Rule;
import org.junit.Test;
import org.testcontainers.testsupport.Flaky;
import org.testcontainers.testsupport.FlakyTestJUnit4RetryRule;
import redis.clients.jedis.Jedis;
import redis.clients.jedis.exceptions.JedisConnectionException;

Expand Down Expand Up @@ -30,6 +32,9 @@ public class ToxiproxyTest {
.withNetwork(network);
// }

@Rule
public FlakyTestJUnit4RetryRule retry = new FlakyTestJUnit4RetryRule();

@Test
public void testDirect() {
final Jedis jedis = new Jedis(redis.getContainerIpAddress(), redis.getFirstMappedPort());
Expand All @@ -40,6 +45,7 @@ public void testDirect() {
}

@Test
@Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1769", reviewDate = "2019-10-01")
public void testLatencyViaProxy() throws IOException {
// obtainProxyObject {
final ToxiproxyContainer.ContainerProxy proxy = toxiproxy.getProxy(redis, 6379);
Expand All @@ -66,6 +72,7 @@ public void testLatencyViaProxy() throws IOException {
}

@Test
@Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1769", reviewDate = "2019-10-01")
public void testConnectionCut() {
final ToxiproxyContainer.ContainerProxy proxy = toxiproxy.getProxy(redis, 6379);
final Jedis jedis = new Jedis(proxy.getContainerIpAddress(), proxy.getProxyPort());
Expand All @@ -90,6 +97,7 @@ public void testConnectionCut() {
}

@Test
@Flaky(githubIssueUrl = "https://github.com/testcontainers/testcontainers-java/issues/1769", reviewDate = "2019-10-01")
public void testMultipleProxiesCanBeCreated() {
try (GenericContainer secondRedis = new GenericContainer("redis:5.0.4")
.withExposedPorts(6379)
Expand Down

0 comments on commit 2d1df16

Please sign in to comment.