honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Re-enable packaging tests for windows (#58010) 

This commit fixes the gc logfile name for windows on java 8, and re-enables windows testing of the archive tests.

closes #50825
This commit is contained in:
Ryan Ernst 2020-06-11 16:26:24 -07:00 committed by GitHub
parent bf90b6f221
commit 3bc2601ba3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qa/os/src/test/java/org/elasticsearch/packaging/test/ArchiveTests.java
View File

@ -53,7 +53,6 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.Matchers.emptyString;
import static org.hamcrest.Matchers.startsWith;
import static org.junit.Assume.assumeFalse;
import static org.junit.Assume.assumeThat;
import static org.junit.Assume.assumeTrue;
@ -61,9 +60,6 @@ public class ArchiveTests extends PackagingTestCase {
@BeforeClass
public static void filterDistros() {
// Muted on Windows see: https://github.com/elastic/elasticsearch/issues/50825
assumeFalse(System.getProperty("os.name").startsWith("Windows"));
assumeTrue("only archives", distribution.isArchive());
}
@ -143,8 +139,7 @@ public class ArchiveTests extends PackagingTestCase {
throw e;
}
final String gcLogName = Platforms.LINUX && distribution().hasJdk == false ? "gc.log.0.current" : "gc.log";
final String gcLogName = distribution().hasJdk == false ? "gc.log.0.current" : "gc.log";
assertThat(installation.logs.resolve(gcLogName), fileExists());
ServerUtils.runElasticsearchTests();