Skip to content

Commit b14b803

Browse files
authored
Mute failing tests on Windows (elastic#50825) (elastic#52010)
1 parent 846f87a commit b14b803

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,17 @@
4646
import static org.hamcrest.CoreMatchers.is;
4747
import static org.hamcrest.CoreMatchers.not;
4848
import static org.hamcrest.Matchers.isEmptyString;
49+
import static org.junit.Assume.assumeFalse;
4950
import static org.junit.Assume.assumeThat;
5051
import static org.junit.Assume.assumeTrue;
5152

5253
public class ArchiveTests extends PackagingTestCase {
5354

5455
@BeforeClass
5556
public static void filterDistros() {
57+
// Muted on Windows see: https://github.com/elastic/elasticsearch/issues/50825
58+
assumeFalse(System.getProperty("os.name").startsWith("Windows"));
59+
5660
assumeTrue("only archives", distribution.isArchive());
5761
}
5862

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.elasticsearch.packaging.util.Platforms;
2626
import org.elasticsearch.packaging.util.ServerUtils;
2727
import org.elasticsearch.packaging.util.Shell;
28+
import org.junit.Assume;
2829
import org.junit.Before;
2930
import org.junit.BeforeClass;
3031

@@ -48,6 +49,9 @@ public class CertGenCliTests extends PackagingTestCase {
4849

4950
@Before
5051
public void filterDistros() {
52+
// Muted on Windows see: https://github.com/elastic/elasticsearch/issues/50825
53+
Assume.assumeFalse(System.getProperty("os.name").startsWith("Windows"));
54+
5155
assumeTrue("only default distro", distribution.flavor == Distribution.Flavor.DEFAULT);
5256
assumeTrue("no docker", distribution.packaging != Distribution.Packaging.DOCKER);
5357
}
@@ -100,7 +104,7 @@ public void test31ExtractCerts() throws Exception {
100104
public void test40RunWithCert() throws Exception {
101105
// windows 2012 r2 has powershell 4.0, which lacks Expand-Archive
102106
assumeFalse(Platforms.OS_NAME.equals("Windows Server 2012 R2"));
103-
107+
104108
append(installation.config("elasticsearch.yml"), String.join("\n",
105109
"node.name: mynode",
106110
"xpack.security.transport.ssl.key: " + escapePath(installation.config("certs/mynode/mynode.key")),

0 commit comments

Comments
 (0)