Skip to content

Commit

Permalink
Re-enable packaging tests for windows (#58010)
Browse files Browse the repository at this point in the history
This commit fixes the gc logfile name for windows on java 8, and re-enables windows testing of the archive tests.

closes #50825
  • Loading branch information
rjernst committed Jun 11, 2020
1 parent 0558052 commit a372a4f
Showing 1 changed file with 1 addition and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,13 @@
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;

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());
}

Expand Down Expand Up @@ -143,8 +139,7 @@ public void test50StartAndStop() throws Exception {
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();

Expand Down

0 comments on commit a372a4f

Please sign in to comment.