Skip to content

Commit

Permalink
Enable QuarkusCliVersionIT on windows snapshots as #1464 is fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
jedla97 authored and michalvavrik committed Dec 15, 2024
1 parent 61ea217 commit f1c4596
Showing 1 changed file with 2 additions and 8 deletions.
Original file line number Diff line number Diff line change
@@ -1,27 +1,25 @@
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;
import io.quarkus.test.scenarios.QuarkusScenario;
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
Expand All @@ -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;
}
}

0 comments on commit f1c4596

Please sign in to comment.