Merge pull request #331 from launchdarkly/eb/sc-157098/flaky-tests-2

make LDEndToEndClientTest.test____SpecialHttpConfigurations less timing-sensitive

Author: eli-darkly

src/test/java/com/launchdarkly/sdk/server/LDClientEndToEndTest.java

@@ -123,9 +123,7 @@ public void testPollingModeSpecialHttpConfigurations() throws Exception {
  new LDConfig.Builder()
  .dataSource(Components.pollingDataSource().baseURI(serverUri))
  .events(noEvents())
- .http(httpConfig)
- .startWait(Duration.ofMillis(100))
- .build());
+ .http(httpConfig));
  }
 
  @Test
@@ -208,9 +206,7 @@ public void testStreamingModeSpecialHttpConfigurations() throws Exception {
  new LDConfig.Builder()
  .dataSource(Components.streamingDataSource().baseURI(serverUri))
  .events(noEvents())
- .http(httpConfig)
- .startWait(Duration.ofMillis(100))
- .build());
+ .http(httpConfig));
  }
 
  @Test
@@ -254,17 +250,21 @@ public void clientSendsDiagnosticEvent() throws Exception {
  }
 
  private static void testWithSpecialHttpConfigurations(Handler handler,
- BiFunction<URI, HttpConfigurationFactory, LDConfig> makeConfig) throws Exception {
+ BiFunction<URI, HttpConfigurationFactory, LDConfig.Builder> makeConfig) throws Exception {
  TestHttpUtil.testWithSpecialHttpConfigurations(handler,
  (serverUri, httpConfig) -> {
- LDConfig config = makeConfig.apply(serverUri, httpConfig);
+ LDConfig config = makeConfig.apply(serverUri, httpConfig)
+ .startWait(Duration.ofSeconds(10)) // allow extra time to be sure it can connect
+ .build();
  try (LDClient client = new LDClient(sdkKey, config)) {
  assertTrue(client.isInitialized());
  assertTrue(client.boolVariation(flagKey, user, false));
  }
  },
  (serverUri, httpConfig) -> {
- LDConfig config = makeConfig.apply(serverUri, httpConfig);
+ LDConfig config = makeConfig.apply(serverUri, httpConfig)
+ .startWait(Duration.ofMillis(100)) // don't wait terribly long when we don't expect it to succeed
+ .build();
  try (LDClient client = new LDClient(sdkKey, config)) {
  assertFalse(client.isInitialized());
  }