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

Mute failing tests on Windows (#50825) (#52010)

This commit is contained in:
Mark Vieira 2020-02-06 10:47:14 -08:00 committed by GitHub
parent 846f87a26e
commit b14b803676
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,6 +46,7 @@ import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.Matchers.isEmptyString; import static org.hamcrest.Matchers.isEmptyString;
import static org.junit.Assume.assumeFalse;
import static org.junit.Assume.assumeThat; import static org.junit.Assume.assumeThat;
import static org.junit.Assume.assumeTrue; import static org.junit.Assume.assumeTrue;
@ -53,6 +54,9 @@ public class ArchiveTests extends PackagingTestCase {
@BeforeClass @BeforeClass
public static void filterDistros() { 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()); assumeTrue("only archives", distribution.isArchive());
} }

6
qa/os/src/test/java/org/elasticsearch/packaging/test/CertGenCliTests.java
View File

@ -25,6 +25,7 @@ import org.elasticsearch.packaging.util.FileUtils;
import org.elasticsearch.packaging.util.Platforms; import org.elasticsearch.packaging.util.Platforms;
import org.elasticsearch.packaging.util.ServerUtils; import org.elasticsearch.packaging.util.ServerUtils;
import org.elasticsearch.packaging.util.Shell; import org.elasticsearch.packaging.util.Shell;
import org.junit.Assume;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
@ -48,6 +49,9 @@ public class CertGenCliTests extends PackagingTestCase {
@Before @Before
public void filterDistros() { 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("only default distro", distribution.flavor == Distribution.Flavor.DEFAULT);
assumeTrue("no docker", distribution.packaging != Distribution.Packaging.DOCKER); assumeTrue("no docker", distribution.packaging != Distribution.Packaging.DOCKER);
} }
@ -100,7 +104,7 @@ public class CertGenCliTests extends PackagingTestCase {
public void test40RunWithCert() throws Exception { public void test40RunWithCert() throws Exception {
// windows 2012 r2 has powershell 4.0, which lacks Expand-Archive // windows 2012 r2 has powershell 4.0, which lacks Expand-Archive
assumeFalse(Platforms.OS_NAME.equals("Windows Server 2012 R2")); assumeFalse(Platforms.OS_NAME.equals("Windows Server 2012 R2"));
append(installation.config("elasticsearch.yml"), String.join("\n", append(installation.config("elasticsearch.yml"), String.join("\n",
"node.name: mynode", "node.name: mynode",
"xpack.security.transport.ssl.key: " + escapePath(installation.config("certs/mynode/mynode.key")), "xpack.security.transport.ssl.key: " + escapePath(installation.config("certs/mynode/mynode.key")),