Skip to content

Commit 7930dca

Browse files
committed
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 #20260
1 parent d159920 commit 7930dca

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

qa/smoke-test-client/src/test/java/org/elasticsearch/smoketest/SmokeTestClientIT.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
package org.elasticsearch.smoketest;
2121

22-
import org.apache.lucene.util.Constants;
2322
import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
2423
import org.elasticsearch.action.search.SearchResponse;
2524
import org.elasticsearch.client.Client;
@@ -29,18 +28,10 @@
2928

3029
public class SmokeTestClientIT extends ESSmokeClientTestCase {
3130

32-
// needed to avoid the test suite from failing for having no tests
33-
// TODO: remove when Netty 4.1.5 is upgraded to Netty 4.1.6 including https://github.com/netty/netty/pull/5778
34-
public void testSoThatTestsDoNotFail() {
35-
36-
}
37-
3831
/**
3932
* Check that we are connected to a cluster named "elasticsearch".
4033
*/
4134
public void testSimpleClient() {
42-
// TODO: remove when Netty 4.1.5 is upgraded to Netty 4.1.6 including https://github.com/netty/netty/pull/5778
43-
assumeFalse("JDK is JDK 9", Constants.JRE_IS_MINIMUM_JAVA9);
4435
Client client = getClient();
4536

4637
// START SNIPPET: java-doc-admin-cluster-health
@@ -55,8 +46,6 @@ public void testSimpleClient() {
5546
* Create an index and index some docs
5647
*/
5748
public void testPutDocument() {
58-
// TODO: remove when Netty 4.1.5 is upgraded to Netty 4.1.6 including https://github.com/netty/netty/pull/5778
59-
assumeFalse("JDK is JDK 9", Constants.JRE_IS_MINIMUM_JAVA9);
6049
Client client = getClient();
6150

6251
// START SNIPPET: java-doc-index-doc-simple

0 commit comments

Comments
 (0)