From 568bc53bd0d24f4ba73089819f045186c44d0b8c Mon Sep 17 00:00:00 2001 From: Mark Vieira Date: Wed, 12 May 2021 09:58:51 -0700 Subject: [PATCH 1/3] Use RUNTIME_JAVA_HOME for test clusters --- .../org/elasticsearch/gradle/test/ClusterFormationTasks.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy index bd0c9d3df4aed..9f6b9cbef0883 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy @@ -700,6 +700,7 @@ class ClusterFormationTasks { esJavaOpts.add('-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000') } node.env['ES_JAVA_OPTS'] = esJavaOpts.join(" ") + node.env['JAVA_HOME'] = node.getJavaHome() // project.logger.info("Starting node in ${node.clusterName} distribution: ${node.config.distribution}") From 6538d56a54a9ea1aedf07a0ec7bf23f68d0ba155 Mon Sep 17 00:00:00 2001 From: Mark Vieira Date: Wed, 12 May 2021 10:12:30 -0700 Subject: [PATCH 2/3] Remove empty comment --- .../org/elasticsearch/gradle/test/ClusterFormationTasks.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy index 9f6b9cbef0883..5cada84d78009 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy @@ -702,7 +702,6 @@ class ClusterFormationTasks { node.env['ES_JAVA_OPTS'] = esJavaOpts.join(" ") node.env['JAVA_HOME'] = node.getJavaHome() - // project.logger.info("Starting node in ${node.clusterName} distribution: ${node.config.distribution}") } return start From 64b3679531b492b0ec1e7c4c67391b00adab49b3 Mon Sep 17 00:00:00 2001 From: Mark Vieira Date: Wed, 26 May 2021 13:05:30 -0700 Subject: [PATCH 3/3] Fix busted test --- .../xpack/sql/qa/single_node/JdbcDocCsvSpecIT.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/x-pack/plugin/sql/qa/single-node/src/test/java/org/elasticsearch/xpack/sql/qa/single_node/JdbcDocCsvSpecIT.java b/x-pack/plugin/sql/qa/single-node/src/test/java/org/elasticsearch/xpack/sql/qa/single_node/JdbcDocCsvSpecIT.java index f89f801d28203..804e2d736fcd4 100644 --- a/x-pack/plugin/sql/qa/single-node/src/test/java/org/elasticsearch/xpack/sql/qa/single_node/JdbcDocCsvSpecIT.java +++ b/x-pack/plugin/sql/qa/single-node/src/test/java/org/elasticsearch/xpack/sql/qa/single_node/JdbcDocCsvSpecIT.java @@ -30,9 +30,9 @@ * gets reflected in the dataset structure. * The doc tests while redundant, try to be expressive first and foremost and sometimes * the dataset isn't exactly convenient. - * + * * Also looking around for the tests across the test files isn't trivial. - * + * * That's not to say the two cannot be merged however that felt like too much of an effort * at this stage and, to not keep things stalling, started with this approach. */ @@ -69,7 +69,7 @@ protected void assertResults(ResultSet expected, ResultSet elastic) throws SQLEx // uncomment this to printout the result set and create new CSV tests // //JdbcTestUtils.logLikeCLI(elastic, log); - JdbcAssert.assertResultSets(expected, elastic, log, true, false); + JdbcAssert.assertResultSets(expected, elastic, log, true, true); } @Override @@ -87,4 +87,4 @@ protected final void doTest() throws Throwable { assertResults(expected, elasticResults); } } -} \ No newline at end of file +}