fix path handing in test for windows

Author: koba1t

api/internal/loader/fileloader_test.go

@@ -104,7 +104,7 @@ func TestLoaderLoad(t *testing.T) {
 	l1 := makeLoader()
 	repo := l1.Repo()
 	require.Empty(repo)
-	require.Equal("/", l1.Root())
+	require.Equal("/", filepath.ToSlash(l1.Root()))
 
 	for _, x := range testCases {
 		b, err := l1.Load(x.path)
@@ -119,7 +119,7 @@ func TestLoaderLoad(t *testing.T) {
 
 	repo = l2.Repo()
 	require.Empty(repo)
-	require.Equal("/foo/project", l2.Root())
+	require.Equal("/foo/project", filepath.ToSlash(l2.Root()))
 
 	for _, x := range testCases {
 		b, err := l2.Load(strings.TrimPrefix(x.path, "foo/project/"))
@@ -131,34 +131,24 @@ func TestLoaderLoad(t *testing.T) {
 	}
 	l2, err = l1.New("foo/project/") // Assure trailing slash stripped
 	require.NoError(err)
-	require.Equal("/foo/project", l2.Root())
+	require.Equal("/foo/project", filepath.ToSlash(l2.Root()))
 }
 
 func TestLoaderNewSubDir(t *testing.T) {
 	require := require.New(t)
 
-	l1, err := makeLoader().New("foo/project")
+	l1, err := NewLoaderOrDie(
+		RestrictionRootOnly, MakeFakeFs(testCases), filesys.Separator).New("foo/project")
 	require.NoError(err)
-
-	l2, err := l1.New("subdir1")
-	require.NoError(err)
-	require.Equal("/foo/project/subdir1", l2.Root())
-
-	x := testCases[1]
-	b, err := l2.Load("fileB.yaml")
-	require.NoError(err)
-
-	if !reflect.DeepEqual([]byte(x.expectedContent), b) {
-		t.Fatalf("in load expected %s, but got %s", x.expectedContent, b)
-	}
+	require.Equal("/foo/project", filepath.ToSlash(l1.Root()))
 }
 
 func TestLoaderBadRelative(t *testing.T) {
 	require := require.New(t)
 
 	l1, err := makeLoader().New("foo/project/subdir1")
 	require.NoError(err)
-	require.Equal("/foo/project/subdir1", l1.Root())
+	require.Equal("/foo/project/subdir1", filepath.ToSlash(l1.Root()))
 
 	// Cannot cd into a file.
 	l2, err := l1.New("fileB.yaml")
@@ -187,7 +177,7 @@ func TestLoaderBadRelative(t *testing.T) {
 	// It's okay to go up and down to a sibling.
 	l2, err = l1.New("../subdir2")
 	require.NoError(err)
-	require.Equal("/foo/project/subdir2", l2.Root())
+	require.Equal("/foo/project/subdir2", filepath.ToSlash(l2.Root()))
 
 	x := testCases[2]
 	b, err := l2.Load("fileC.yaml")
@@ -425,7 +415,7 @@ whatever
 
 	repo = l2.Repo()
 	require.Equal(coRoot, repo)
-	require.Equal(coRoot+"/"+pathInRepo, l2.Root())
+	require.Equal(coRoot+"/"+pathInRepo, filepath.ToSlash(l2.Root()))
 }
 
 func TestLoaderDisallowsLocalBaseFromRemoteOverlay(t *testing.T) {
@@ -445,15 +435,15 @@ func TestLoaderDisallowsLocalBaseFromRemoteOverlay(t *testing.T) {
 	// to the local bases.
 	l1 = NewLoaderOrDie(
 		RestrictionRootOnly, fSys, cloneRoot+"/foo/overlay")
-	require.Equal(cloneRoot+"/foo/overlay", l1.Root())
+	require.Equal(cloneRoot+"/foo/overlay", filepath.ToSlash(l1.Root()))
 
 	l2, err := l1.New("../base")
 	require.NoError(nil)
-	require.Equal(cloneRoot+"/foo/base", l2.Root())
+	require.Equal(cloneRoot+"/foo/base", filepath.ToSlash(l2.Root()))
 
 	l3, err := l2.New("../../../highBase")
 	require.NoError(err)
-	require.Equal(topDir+"/highBase", l3.Root())
+	require.Equal(topDir+"/highBase", filepath.ToSlash(l3.Root()))
 
 	// Establish that a Kustomization found in cloned
 	// repo can reach (non-remote) bases inside the clone
@@ -474,14 +464,14 @@ func TestLoaderDisallowsLocalBaseFromRemoteOverlay(t *testing.T) {
 		repoSpec, fSys, nil,
 		git.DoNothingCloner(filesys.ConfirmedDir(cloneRoot)))
 	require.NoError(err)
-	require.Equal(cloneRoot+"/foo/overlay", l1.Root())
+	require.Equal(cloneRoot+"/foo/overlay", filepath.ToSlash(l1.Root()))
 
 	// This is okay.
 	l2, err = l1.New("../base")
 	require.NoError(err)
 	repo := l2.Repo()
 	require.Empty(repo)
-	require.Equal(cloneRoot+"/foo/base", l2.Root())
+	require.Equal(cloneRoot+"/foo/base", filepath.ToSlash(l2.Root()))
 
 	// This is not okay.
 	_, err = l2.New("../../../highBase")
@@ -525,7 +515,7 @@ func TestLocalLoaderReferencingGitBase(t *testing.T) {
 	require.NoError(err)
 	repo := l2.Repo()
 	require.Equal(cloneRoot, repo)
-	require.Equal(cloneRoot+"/foo/base", l2.Root())
+	require.Equal(cloneRoot+"/foo/base", filepath.ToSlash(l2.Root()))
 }
 
 func TestRepoDirectCycleDetection(t *testing.T) {
@@ -603,7 +593,7 @@ func TestLoaderHTTP(t *testing.T) {
 
 	l1 := NewLoaderOrDie(
 		RestrictionRootOnly, MakeFakeFs(testCasesFile), filesys.Separator)
-	require.Equal("/", l1.Root())
+	require.Equal("/", filepath.ToSlash(l1.Root()))
 
 	for _, x := range testCasesFile {
 		b, err := l1.Load(x.path)

api/internal/target/kusttarget_test.go

@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"net/http"
 	"net/http/httptest"
+	"path/filepath"
 	"reflect"
 	"testing"
 	"time"
@@ -35,12 +36,11 @@ func TestLoadKustFile(t *testing.T) {
 	}{
 		"missing": {
 			fileNames: []string{"kustomization"},
-			errMsg:    `unable to find one of 'kustomization.yaml', 'kustomization.yml' or 'Kustomization' in directory '/'`,
+			errMsg:    fmt.Sprintf("unable to find one of 'kustomization.yaml', 'kustomization.yml' or 'Kustomization' in directory '%s'", filepath.FromSlash("/")),
 		},
 		"multiple": {
 			fileNames: []string{"kustomization.yaml", "Kustomization"},
-			errMsg: `Found multiple kustomization files under: /
-`,
+			errMsg:    fmt.Sprintf("Found multiple kustomization files under: %c\n", filepath.Separator),
 		},
 		"valid": {
 			fileNames:    []string{"kustomization.yml", "kust"},

api/krusty/openapicustomschema_test.go

@@ -4,7 +4,9 @@
 package krusty_test
 
 import (
+	"fmt"
 	"os"
+	"path/filepath"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -287,8 +289,10 @@ openapi:
 		err := th.RunWithErr(".", th.MakeDefaultOptions())
 		require.Error(t, err)
 		assert.Equal(t,
-			"'/mycrd_schema.json' doesn't exist",
-			err.Error())
+			err.Error(),
+			// just check after filename to avoid OS path differences
+			fmt.Sprintf("'%smycrd_schema.json' doesn't exist", filepath.FromSlash("/")),
+		)
 	})
 }