Skip to content

Commit

Permalink
Mute failing tests on Windows (#50825) (#52010)
Browse files Browse the repository at this point in the history
  • Loading branch information
mark-vieira committed Feb 6, 2020
1 parent 67a264b commit dbc341d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,17 @@
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.Matchers.isEmptyString;
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
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.elasticsearch.packaging.util.Platforms;
import org.elasticsearch.packaging.util.ServerUtils;
import org.elasticsearch.packaging.util.Shell;
import org.junit.Assume;
import org.junit.Before;
import org.junit.BeforeClass;

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

@Before
public void filterDistros() {
// Muted on Windows see: https://github.com/elastic/elasticsearch/issues/50825
Assume.assumeFalse(System.getProperty("os.name").startsWith("Windows"));

assumeTrue("only default distro", distribution.flavor == Distribution.Flavor.DEFAULT);
assumeTrue("no docker", distribution.packaging != Distribution.Packaging.DOCKER);
}
Expand Down Expand Up @@ -100,7 +104,7 @@ public void test31ExtractCerts() throws Exception {
public void test40RunWithCert() throws Exception {
// windows 2012 r2 has powershell 4.0, which lacks Expand-Archive
assumeFalse(Platforms.OS_NAME.equals("Windows Server 2012 R2"));

append(installation.config("elasticsearch.yml"), String.join("\n",
"node.name: mynode",
"xpack.security.transport.ssl.key: " + escapePath(installation.config("certs/mynode/mynode.key")),
Expand Down

0 comments on commit dbc341d

Please sign in to comment.