From 7930dcad898fbc37c7a07abc8319ca3ab259a8ae Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Mon, 27 Mar 2017 19:56:57 -0400 Subject: [PATCH] Reenable smoke test client tests on JDK 9 These tests were disabled due to an issue in Netty which has since been resolved and integrated into Elasticsearch. Relates elastic/elasticsearch#20260 --- .../elasticsearch/smoketest/SmokeTestClientIT.java | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/qa/smoke-test-client/src/test/java/org/elasticsearch/smoketest/SmokeTestClientIT.java b/qa/smoke-test-client/src/test/java/org/elasticsearch/smoketest/SmokeTestClientIT.java index 6380ed90e18..b540bd8d915 100644 --- a/qa/smoke-test-client/src/test/java/org/elasticsearch/smoketest/SmokeTestClientIT.java +++ b/qa/smoke-test-client/src/test/java/org/elasticsearch/smoketest/SmokeTestClientIT.java @@ -19,7 +19,6 @@ package org.elasticsearch.smoketest; -import org.apache.lucene.util.Constants; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.client.Client; @@ -29,18 +28,10 @@ import static org.hamcrest.Matchers.greaterThan; public class SmokeTestClientIT extends ESSmokeClientTestCase { - // needed to avoid the test suite from failing for having no tests - // TODO: remove when Netty 4.1.5 is upgraded to Netty 4.1.6 including https://github.com/netty/netty/pull/5778 - public void testSoThatTestsDoNotFail() { - - } - /** * Check that we are connected to a cluster named "elasticsearch". */ public void testSimpleClient() { - // TODO: remove when Netty 4.1.5 is upgraded to Netty 4.1.6 including https://github.com/netty/netty/pull/5778 - assumeFalse("JDK is JDK 9", Constants.JRE_IS_MINIMUM_JAVA9); Client client = getClient(); // START SNIPPET: java-doc-admin-cluster-health @@ -55,8 +46,6 @@ public class SmokeTestClientIT extends ESSmokeClientTestCase { * Create an index and index some docs */ public void testPutDocument() { - // TODO: remove when Netty 4.1.5 is upgraded to Netty 4.1.6 including https://github.com/netty/netty/pull/5778 - assumeFalse("JDK is JDK 9", Constants.JRE_IS_MINIMUM_JAVA9); Client client = getClient(); // START SNIPPET: java-doc-index-doc-simple