SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-08-10 14:36:11 +02:00
parent a1aae6bd6c 6f1d88c9b4
commit b8adc57bf2
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/provider/wiremock/StubRunnerWireMockTestExecutionListener.java
View File

@@ -45,6 +45,14 @@ public final class StubRunnerWireMockTestExecutionListener extends AbstractTestE
}
entry.getKey().start(entry.getValue().port);
entry.getKey().registerDescriptors(mappings);
/*
Thanks to Tom Akehurst:
I looked at tcpdump while running the failing test. HttpUrlConnection is doing something weird - it's creating a connection in a
previous test case, which works fine, then the usual fin -> fin ack etc. etc. ending handshake happens. But it seems it
isn't discarded, but reused after that. Because the server thinks (rightly) that the connection is closed, it just sends a RST packet.
Calling the admin endpoint just happened to remove the dead connection from the pool.
This also fixes the problem (which using the Java HTTP client): System.setProperty("http.keepAlive", "false");
*/
Assert.isTrue(new RestTemplate().getForEntity("http://localhost:" + entry.getValue().port + "/__admin/mappings", String.class)
.getStatusCode().is2xxSuccessful(), "__admin/mappings endpoint wasn't accessible");
}

8
spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java
View File

@@ -161,6 +161,14 @@ public class WireMockConfiguration implements SmartLifecycle {
if (log.isDebugEnabled()) {
log.debug("Started WireMock at port [" + this.server.port() + "]. It has [" + this.server.getStubMappings().size() + "] mappings registered");
}
/*
Thanks to Tom Akehurst:
I looked at tcpdump while running the failing test. HttpUrlConnection is doing something weird - it's creating a connection in a
previous test case, which works fine, then the usual fin -> fin ack etc. etc. ending handshake happens. But it seems it
isn't discarded, but reused after that. Because the server thinks (rightly) that the connection is closed, it just sends a RST packet.
Calling the admin endpoint just happened to remove the dead connection from the pool.
This also fixes the problem (which using the Java HTTP client): System.setProperty("http.keepAlive", "false");
*/
Assert.isTrue(new RestTemplate().getForEntity("http://localhost:" + this.server.port() + "/__admin/mappings", String.class)
.getStatusCode().is2xxSuccessful(), "__admin/mappings endpoint wasn't accessible");
}