From 169f9a4308f2fb3d804809da75e1b9bdb9155583 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= Date: Thu, 3 Apr 2025 08:51:19 +0200 Subject: [PATCH] client/blueprints_test.go: delete condition for composer version < 83 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The version check is failing on the "dot" version, while trying to convert "118.1" to an integer. Delete the condition for skipping the test, because it will never be running on anything older than v83 anyway. Signed-off-by: Tomáš Hozza --- internal/client/blueprints_test.go | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/internal/client/blueprints_test.go b/internal/client/blueprints_test.go index fbb76fa3f..d854eb8f0 100644 --- a/internal/client/blueprints_test.go +++ b/internal/client/blueprints_test.go @@ -11,10 +11,7 @@ package client import ( - "fmt" - "os/exec" "sort" - "strconv" "testing" "github.com/osbuild/osbuild-composer/internal/common" @@ -1063,22 +1060,6 @@ func TestBlueprintFreezeGlobsV0(t *testing.T) { t.Skip() } - // works with osbuild-composer v83 and later - rpm_q := exec.Command("rpm", "-q", "--qf", "%{version}", "osbuild-composer") - out, err := rpm_q.CombinedOutput() - if err != nil { - assert.Fail(t, fmt.Sprintf("Error during rpm -q: %s", err)) - } - - rpm_version, err := strconv.Atoi(string(out)) - if err != nil { - assert.Fail(t, "Error during str-int conversion", err) - } - - if rpm_version < 83 { - t.Skip() - } - bp := `{ "name": "test-freeze-blueprint-glob-v0", "description": "TestBlueprintFreezeGlobsV0",