actions/fluxcd-flux2
3
0
Fork 0
mirror of https://github.com/fluxcd/flux2.git synced 2026-02-07 16:27:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2748 from makkes/debug-e2e-failure

Browse source 
fix e2e tests
This commit is contained in:
Max Jonas Werner 2022-05-18 17:28:28 +02:00 committed by GitHub
commit 46fbc7c71b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cmd/flux/check_test.go
View file

@ -26,7 +26,6 @@ import (
"testing" "testing"
"github.com/fluxcd/flux2/internal/utils" "github.com/fluxcd/flux2/internal/utils"
"k8s.io/apimachinery/pkg/version"
) )
func TestCheckPre(t *testing.T) { func TestCheckPre(t *testing.T) {
@ -35,17 +34,19 @@ func TestCheckPre(t *testing.T) {
t.Fatalf("Error running utils.ExecKubectlCommand: %v", err.Error()) t.Fatalf("Error running utils.ExecKubectlCommand: %v", err.Error())
} }
var versions map[string]version.Info var versions map[string]interface{}
if err := json.Unmarshal([]byte(jsonOutput), &versions); err != nil { if err := json.Unmarshal([]byte(jsonOutput), &versions); err != nil {
t.Fatalf("Error unmarshalling: %v", err.Error()) t.Fatalf("Error unmarshalling '%s': %v", jsonOutput, err.Error())
} }
serverVersion := strings.TrimPrefix(versions["serverVersion"].GitVersion, "v") serverGitVersion := strings.TrimPrefix(
versions["serverVersion"].(map[string]interface{})["gitVersion"].(string),
"v")
cmd := cmdTestCase{ cmd := cmdTestCase{
args: "check --pre", args: "check --pre",
assert: assertGoldenTemplateFile("testdata/check/check_pre.golden", map[string]string{ assert: assertGoldenTemplateFile("testdata/check/check_pre.golden", map[string]string{
"serverVersion": serverVersion, "serverVersion": serverGitVersion,
}), }),
} }
cmd.runTestCmd(t) cmd.runTestCmd(t)