Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mark toxiproxy tests as flaky pending further analysis #1772

Merged
merged 2 commits into from Aug 23, 2019
Merged

Mark toxiproxy tests as flaky pending further analysis #1772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
212456a
Refs #1769: mark toxiproxy tests as flaky pending further analysis
rnorth Aug 22, 2019
6a38e75
Merge branch 'master' into mark-toxiproxy-tests-flaky
rnorth Aug 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions modules/toxiproxy/build.gradle
View file
Open in desktop
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')
}
8 changes: 8 additions & 0 deletions modules/toxiproxy/src/test/java/org/testcontainers/containers/ToxiproxyTest.java
View file
Open in desktop
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