Merge remote-tracking branch 'elastic/master' into uuid-naming-data-blobs

original-brownbear · original-brownbear · commit 81d40c96ad91 · 2019-04-01T17:02:33.000+02:00
diff --git a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookHttpsIntegrationTests.java b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/webhook/WebhookHttpsIntegrationTests.java
@@ -67,6 +67,7 @@ public void stopWebservice() throws Exception {
         webServer.close();
     }
 
+    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/35503")
     public void testHttps() throws Exception {
         webServer.enqueue(new MockResponse().setResponseCode(200).setBody("body"));
         HttpRequestTemplate.Builder builder = HttpRequestTemplate.builder("localhost", webServer.getPort())

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ public void stopWebservice() throws Exception {`
`67`	`67`	`webServer.close();`
`68`	`68`	`}`
`69`	`69`
	`70`	`+ @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/35503")`
`70`	`71`	`public void testHttps() throws Exception {`
`71`	`72`	`webServer.enqueue(new MockResponse().setResponseCode(200).setBody("body"));`
`72`	`73`	`HttpRequestTemplate.Builder builder = HttpRequestTemplate.builder("localhost", webServer.getPort())`