osbuild-composer/SOURCES/revert-Conditionally-skip-test-based-on-osbuild-compose.patch

38 lines
1007 B
Diff

diff -aruN osbuild-composer-88.1/internal/client/blueprints_test.go osbuild-composer-88.1.alma/internal/client/blueprints_test.go
--- osbuild-composer-88.1/internal/client/blueprints_test.go 2023-09-19 21:47:56
+++ osbuild-composer-88.1.alma/internal/client/blueprints_test.go 2023-11-07 17:26:20
@@ -12,10 +12,7 @@
import (
"encoding/json"
- "fmt"
- "os/exec"
"sort"
- "strconv"
"strings"
"testing"
@@ -1107,22 +1104,6 @@
func TestBlueprintFreezeGlobsV0(t *testing.T) {
// Test needs real packages, skip it for unit testing
if testState.unitTest {
- 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()
}