You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
52 lines
1.3 KiB
52 lines
1.3 KiB
1 year ago
|
From 21f96abd61be2d10ea9543d137eb51f7ae6c769f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Achilleas Koutsou <achilleas@koutsou.net>
|
||
|
|
Date: Wed, 20 Sep 2023 14:30:36 +0200
|
||
|
|
Subject: [PATCH] test: remove package version check
|
||
|
|
|
||
|
|
Package version parsing fails on minor releases (88.1).
|
||
|
|
---
|
||
|
|
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 8cfa9a7be..c1c89d36e 100644
|
||
|
|
--- a/internal/client/blueprints_test.go
|
||
|
|
+++ b/internal/client/blueprints_test.go
|
||
|
|
@@ -12,10 +12,7 @@ package client
|
||
|
|
|
||
|
|
import (
|
||
|
|
"encoding/json"
|
||
|
|
- "fmt"
|
||
|
|
- "os/exec"
|
||
|
|
"sort"
|
||
|
|
- "strconv"
|
||
|
|
"strings"
|
||
|
|
"testing"
|
||
|
|
|
||
|
|
@@ -1110,22 +1107,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",
|
||
|
|
--
|
||
|
|
2.42.0
|
||
|
|
|