kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-07-07 12:50:26 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

refactor tests to use require instead

Browse Source
This commit is contained in:
Yigit Demirbas
2023-09-27 12:40:05 +02:00
parent df0cd3c4a3
commit 039b05fb16
2 changed files with 23 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kustomize/commands/internal/util/util.go
View File

@@ -45,7 +45,7 @@ func GlobPatternsWithLoader(fSys filesys.FileSystem, ldr ifc.Loader, patterns []
files, err := fSys.Glob(pattern)
if err != nil {
return nil, fmt.Errorf("error on checking the filesystem: %w", err)
return nil, fmt.Errorf("error checking the filesystem: %w", err)
}
if len(files) != 0 {
@@ -55,13 +55,13 @@ func GlobPatternsWithLoader(fSys filesys.FileSystem, ldr ifc.Loader, patterns []
loader, err := ldr.New(pattern)
if err != nil {
return nil, fmt.Errorf("%s has no match: %w", pattern, err)
return nil, fmt.Errorf("pattern %s has no match: %w", pattern, err)
}
result = append(result, pattern)
if loader != nil {
if err = loader.Cleanup(); err != nil {
return nil, fmt.Errorf("error on cleaning up loader: %w", err)
return nil, fmt.Errorf("error cleaning up loader: %w", err)
}
}
}

64
kustomize/commands/internal/util/util_test.go
View File

@@ -8,6 +8,7 @@ import (
"reflect"
"testing"
"github.com/stretchr/testify/require"
"sigs.k8s.io/kustomize/api/ifc"
"sigs.k8s.io/kustomize/kyaml/filesys"
)
@@ -21,26 +22,18 @@ func TestConvertToMap(t *testing.T) {
expected["g"] = "h:k"
result, err := ConvertToMap(args, "annotation")
if err != nil {
t.Errorf("unexpected error: %v", err.Error())
}
require.NoError(t, err, "unexpected error")
eq := reflect.DeepEqual(expected, result)
if !eq {
t.Errorf("Converted map does not match expected, expected: %v, result: %v\n", expected, result)
}
require.True(t, eq, "Converted map does not match expected")
}
func TestConvertToMapError(t *testing.T) {
args := "a:b,c:\"d\",:f:g"
_, err := ConvertToMap(args, "annotation")
if err == nil {
t.Errorf("expected an error")
}
if err.Error() != "invalid annotation: ':f:g' (need k:v pair where v may be quoted)" {
t.Errorf("incorrect error: %v", err.Error())
}
require.Error(t, err, "expected error but did not receive one")
require.Equal(t, "invalid annotation: ':f:g' (need k:v pair where v may be quoted)", err.Error(), "incorrect error")
}
func TestConvertSliceToMap(t *testing.T) {
@@ -52,14 +45,10 @@ func TestConvertSliceToMap(t *testing.T) {
expected["g"] = "h:k"
result, err := ConvertSliceToMap(args, "annotation")
if err != nil {
t.Errorf("unexpected error: %v", err.Error())
}
require.NoError(t, err, "unexpected error")
eq := reflect.DeepEqual(expected, result)
if !eq {
t.Errorf("Converted map does not match expected, expected: %v, result: %v\n", expected, result)
}
require.True(t, eq, "Converted map does not match expected")
}
func TestGlobPatternsWithLoaderRemoteFile(t *testing.T) {
@@ -72,42 +61,29 @@ func TestGlobPatternsWithLoaderRemoteFile(t *testing.T) {
// test load remote file
resources, err := GlobPatternsWithLoader(fSys, ldr, []string{httpPath}, false)
if err != nil {
t.Fatalf("unexpected load error: %v", err)
}
if len(resources) != 1 || resources[0] != httpPath {
t.Fatalf("incorrect resources: %v", resources)
}
require.NoError(t, err, "unexpected load error")
require.Equal(t, 1, len(resources), "incorrect resources")
require.Equal(t, httpPath, resources[0], "incorrect resources")
// test load local and remote file
resources, err = GlobPatternsWithLoader(fSys, ldr, []string{httpPath, "/test.yml"}, false)
if err != nil {
t.Fatalf("unexpected load error: %v", err)
}
if len(resources) != 2 || resources[0] != httpPath || resources[1] != "/test.yml" {
t.Fatalf("incorrect resources: %v", resources)
}
require.NoError(t, err, "unexpected load error")
require.Equal(t, 2, len(resources), "incorrect resources")
require.Equal(t, httpPath, resources[0], "incorrect resources")
require.Equal(t, "/test.yml", resources[1], "incorrect resources")
// test load invalid file
invalidURL := "http://invalid"
resources, err = GlobPatternsWithLoader(fSys, ldr, []string{invalidURL}, false)
if err == nil {
t.Fatalf("expected error but did not receive one")
} else if err.Error() != invalidURL+" has no match: "+invalidURL+" not exist" {
t.Fatalf("unexpected load error: %v", err)
}
if len(resources) > 0 {
t.Fatalf("incorrect resources: %v", resources)
}
require.Error(t, err, "expected error but did not receive one")
require.Equal(t, "pattern "+invalidURL+" has no match: "+invalidURL+" not exist", err.Error(), "unexpected load error")
require.Equal(t, 0, len(resources), "incorrect resources")
// test load unreachable remote file with skipped verification
resources, err = GlobPatternsWithLoader(fSys, ldr, []string{invalidURL}, true)
if err != nil {
t.Fatalf("unexpected load error: %v", err)
}
if len(resources) != 1 || resources[0] != invalidURL {
t.Fatalf("incorrect resources: %v", resources)
}
require.NoError(t, err, "unexpected load error")
require.Equal(t, 1, len(resources), "incorrect resources")
require.Equal(t, invalidURL, resources[0], "incorrect resources")
}
type fakeLoader struct {