mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Disable incompatible tests on macOS AArch64
This commit also updates related test support classes. See gh-31539
This commit is contained in:
parent
8c4708982b
commit
f591c75ad7
@ -40,7 +40,7 @@ public @interface DisabledOnOs {
|
||||
* See {@link org.junit.jupiter.api.condition.DisabledOnOs#value()}.
|
||||
* @return os
|
||||
*/
|
||||
OS os();
|
||||
OS[] os();
|
||||
|
||||
/**
|
||||
* Architecture of the operating system.
|
||||
|
@ -18,6 +18,7 @@ package org.springframework.boot.testsupport.junit;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
import org.junit.jupiter.api.condition.OS;
|
||||
import org.junit.jupiter.api.extension.ConditionEvaluationResult;
|
||||
import org.junit.jupiter.api.extension.ExecutionCondition;
|
||||
import org.junit.jupiter.api.extension.ExtensionContext;
|
||||
@ -42,11 +43,15 @@ class DisabledOnOsCondition implements ExecutionCondition {
|
||||
private ConditionEvaluationResult evaluate(DisabledOnOs annotation) {
|
||||
String architecture = System.getProperty("os.arch");
|
||||
String os = System.getProperty("os.name");
|
||||
if (annotation.os().isCurrentOs() && annotation.architecture().equals(architecture)) {
|
||||
String reason = annotation.disabledReason().isEmpty()
|
||||
? String.format("Disabled on OS = %s, architecture = %s", os, architecture)
|
||||
: annotation.disabledReason();
|
||||
return ConditionEvaluationResult.disabled(reason);
|
||||
if (annotation.architecture().equals(architecture)) {
|
||||
for (OS targetOs : annotation.os()) {
|
||||
if (targetOs.isCurrentOs()) {
|
||||
String reason = annotation.disabledReason().isEmpty()
|
||||
? String.format("Disabled on OS = %s, architecture = %s", os, architecture)
|
||||
: annotation.disabledReason();
|
||||
return ConditionEvaluationResult.disabled(reason);
|
||||
}
|
||||
}
|
||||
}
|
||||
return ConditionEvaluationResult
|
||||
.enabled(String.format("Enabled on OS = %s, architecture = %s", os, architecture));
|
||||
|
@ -57,8 +57,8 @@ class SslServerCustomizerTests {
|
||||
|
||||
@Test
|
||||
@SuppressWarnings("rawtypes")
|
||||
@DisabledOnOs(os = OS.LINUX, architecture = "aarch64",
|
||||
disabledReason = "conscrypt doesn't support Linux aarch64, see https://github.com/google/conscrypt/issues/1051")
|
||||
@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
|
||||
disabledReason = "conscrypt doesn't support Linux/macOS aarch64, see https://github.com/google/conscrypt/issues/1051")
|
||||
void whenHttp2IsEnabledServerConnectorsHasSslAlpnH2AndHttpConnectionFactories() {
|
||||
Http2 http2 = new Http2();
|
||||
http2.setEnabled(true);
|
||||
@ -71,8 +71,8 @@ class SslServerCustomizerTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisabledOnOs(os = OS.LINUX, architecture = "aarch64",
|
||||
disabledReason = "conscrypt doesn't support Linux aarch64, see https://github.com/google/conscrypt/issues/1051")
|
||||
@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
|
||||
disabledReason = "conscrypt doesn't support Linux/macOS aarch64, see https://github.com/google/conscrypt/issues/1051")
|
||||
void alpnConnectionFactoryHasNullDefaultProtocolToAllowNegotiationToHttp11() {
|
||||
Http2 http2 = new Http2();
|
||||
http2.setEnabled(true);
|
||||
|
Loading…
Reference in New Issue
Block a user