From f1c4596cef0b18ea1bb7f05009c8c41bc528c42a Mon Sep 17 00:00:00 2001 From: Jakub Jedlicka Date: Wed, 11 Dec 2024 13:54:10 +0100 Subject: [PATCH] Enable QuarkusCliVersionIT on windows snapshots as #1464 is fixed --- .../io/quarkus/ts/quarkus/cli/QuarkusCliVersionIT.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliVersionIT.java b/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliVersionIT.java index 05c75155f..0e9a94c94 100644 --- a/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliVersionIT.java +++ b/quarkus-cli/src/test/java/io/quarkus/ts/quarkus/cli/QuarkusCliVersionIT.java @@ -1,14 +1,12 @@ package io.quarkus.ts.quarkus.cli; -import static io.quarkus.test.scenarios.annotations.DisabledOnQuarkusSnapshotCondition.isQuarkusSnapshotVersion; import static org.junit.jupiter.api.Assertions.assertEquals; import jakarta.inject.Inject; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledIf; -import org.junit.jupiter.api.condition.OS; +import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import io.quarkus.builder.Version; import io.quarkus.test.bootstrap.QuarkusCliClient; @@ -16,12 +14,12 @@ import io.quarkus.test.scenarios.annotations.DisabledOnNative; import io.quarkus.test.scenarios.annotations.DisabledOnQuarkusVersion; -@DisabledIf(value = "isQuarkusSnapshotRunOnWindows", disabledReason = "https://github.com/quarkus-qe/quarkus-test-suite/issues/1464") @Tag("QUARKUS-960") @Tag("quarkus-cli") @QuarkusScenario @DisabledOnQuarkusVersion(version = ".*redhat.*", reason = "Do not run CLI version check on productized bits") @DisabledOnNative // Only for JVM verification +@DisabledIfSystemProperty(named = "gh-action-disable-on-win", matches = "true", disabledReason = "We setting `-Dfile.encoding=UTF8` on GH windows action. This causing the output the `picked up java_tool_options` which is not expected in this test.") // TODO remove when We test with JDK 21+ public class QuarkusCliVersionIT { @Inject @@ -35,8 +33,4 @@ public void shouldVersionMatchQuarkusVersion() { // Using shortcut assertEquals(Version.getVersion(), cliClient.run("-v").getOutput()); } - - static boolean isQuarkusSnapshotRunOnWindows() { - return isQuarkusSnapshotVersion() && OS.current() == OS.WINDOWS; - } }