Skip to content

Commit a372a4f

Browse files
committed
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
1 parent 0558052 commit a372a4f

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

qa/os/src/test/java/org/elasticsearch/packaging/test/ArchiveTests.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,13 @@
5353
import static org.hamcrest.CoreMatchers.not;
5454
import static org.hamcrest.Matchers.emptyString;
5555
import static org.hamcrest.Matchers.startsWith;
56-
import static org.junit.Assume.assumeFalse;
5756
import static org.junit.Assume.assumeThat;
5857
import static org.junit.Assume.assumeTrue;
5958

6059
public class ArchiveTests extends PackagingTestCase {
6160

6261
@BeforeClass
6362
public static void filterDistros() {
64-
// Muted on Windows see: https://github.com/elastic/elasticsearch/issues/50825
65-
assumeFalse(System.getProperty("os.name").startsWith("Windows"));
66-
6763
assumeTrue("only archives", distribution.isArchive());
6864
}
6965

@@ -143,8 +139,7 @@ public void test50StartAndStop() throws Exception {
143139
throw e;
144140
}
145141

146-
final String gcLogName = Platforms.LINUX && distribution().hasJdk == false ? "gc.log.0.current" : "gc.log";
147-
142+
final String gcLogName = distribution().hasJdk == false ? "gc.log.0.current" : "gc.log";
148143
assertThat(installation.logs.resolve(gcLogName), fileExists());
149144
ServerUtils.runElasticsearchTests();
150145

0 commit comments

Comments
 (0)