Skip to content

Commit c7288ec

Browse files
committed
Disable reindex-from-old tests in windows
In windows we can't reliable git the pid so we skip the reindex-from-remote tests from old versions of elasticsearch. This is OK because we aren't really testing windows here anyway. It isn't great, but should be safe.
1 parent 9970868 commit c7288ec

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

qa/reindex-from-old/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ should be able to use the standard launching mechanism which
2424
is more flexible and reliable.
2525
"""
2626

27+
import org.apache.tools.ant.taskdefs.condition.Os
28+
2729
apply plugin: 'elasticsearch.standalone-rest-test'
2830
apply plugin: 'elasticsearch.rest-test'
2931

@@ -49,9 +51,9 @@ dependencies {
4951
es090 'org.elasticsearch:elasticsearch:0.90.13@zip'
5052
}
5153

52-
if (project.javaVersion == JavaVersion.VERSION_1_9) {
54+
if (project.javaVersion == JavaVersion.VERSION_1_9 || Os.isFamily(Os.FAMILY_WINDOWS)) {
5355
/* We can't run the dependencies with Java 9 so for now we'll skip the whole
54-
* thing. */
56+
* thing. We can't get the pid files in windows so we skip that as well.... */
5557
integTest.enabled = false
5658
} else {
5759
/* Set up tasks to unzip and run the old versions of ES before running the

0 commit comments

Comments
 (0)