parent
846f87a26e
commit
b14b803676
|
@ -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());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue