Test: Fix hdfs test fixture setup on windows
The test setup for hdfs is a little complicated for windows, needing to
check if the hdfs fixture can be run at all. This was unfortunately not
updated when the integ tests were reorganized into separate runner and
cluster setups.
@@ -68,7 +68,6 @@ task hdfsFixture(type: org.elasticsearch.gradle.test.Fixture) {
baseDir
}
-integTest {
boolean fixtureSupported = false;
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
// hdfs fixture will not start without hadoop native libraries on windows
@@ -89,12 +88,11 @@ integTest {
}
if (fixtureSupported) {
- dependsOn hdfsFixture
+ integTest.dependsOn hdfsFixture
} else {
logger.warn("hdfsFixture unsupported, please set HADOOP_HOME and put HADOOP_HOME\\bin in PATH")
// just tests that the plugin loads
- systemProperty 'tests.rest.suite', 'hdfs_repository/10_basic'
- }
+ integTestRunner.systemProperty 'tests.rest.suite', 'hdfs_repository/10_basic'
}
thirdPartyAudit.excludes = [
