From eb5dd8ae1b5fb9142ecd89e3d4202b4a3b661545 Mon Sep 17 00:00:00 2001 From: Alexander Todorov Date: Wed, 14 Jun 2023 12:26:10 +0300 Subject: [PATCH] Conditionally skip test based on osbuild-compose.rpm version from distro --- internal/client/blueprints_test.go | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/internal/client/blueprints_test.go b/internal/client/blueprints_test.go index c1c89d36e..8cfa9a7be 100644 --- a/internal/client/blueprints_test.go +++ b/internal/client/blueprints_test.go @@ -12,7 +12,10 @@ package client import ( "encoding/json" + "fmt" + "os/exec" "sort" + "strconv" "strings" "testing" @@ -1107,6 +1110,22 @@ 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",