Skip to content

Commit 6e0f4b8

Browse files
committed
fixed TestAssetsFromDir unit test failure in windows
1 parent f422a25 commit 6e0f4b8

File tree

1 file changed

+20
-13
lines changed

1 file changed

+20
-13
lines changed

pkg/minikube/machine/filesync_test.go

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,30 @@ import (
2222
"testing"
2323

2424
"github.com/google/go-cmp/cmp"
25+
"k8s.io/minikube/pkg/minikube/assets"
2526
"k8s.io/minikube/pkg/minikube/localpath"
2627
testutil "k8s.io/minikube/pkg/minikube/tests"
2728
"k8s.io/minikube/pkg/minikube/vmpath"
2829
)
2930

31+
func collectAssets(t *testing.T, root, dest string, flatten bool) []assets.CopyableFile {
32+
t.Helper()
33+
files, err := assetsFromDir(root, dest, flatten)
34+
35+
t.Cleanup(func() {
36+
for _, f := range files {
37+
if cerr := f.Close(); cerr != nil {
38+
t.Logf("warning: closing asset %s failed: %v", f.GetSourcePath(), cerr)
39+
}
40+
}
41+
})
42+
43+
if err != nil {
44+
t.Fatalf("assetsFromDir(%q, %q, flatten=%v) unexpected error: %v", root, dest, flatten, err)
45+
}
46+
return files
47+
}
48+
3049
func TestAssetsFromDir(t *testing.T) {
3150
tests := []struct {
3251
description string
@@ -126,19 +145,7 @@ func TestAssetsFromDir(t *testing.T) {
126145
}
127146
}
128147

129-
actualFiles, err := assetsFromDir(testFileBaseDir, test.vmPath, test.flatten)
130-
131-
t.Cleanup(func() {
132-
for _, f := range actualFiles {
133-
if cerr := f.Close(); cerr != nil {
134-
t.Logf("warning: closing asset %s failed: %v", f.GetSourcePath(), cerr)
135-
}
136-
}
137-
})
138-
139-
if err != nil {
140-
t.Fatalf("got unexpected error adding minikube dir assets: %v", err)
141-
}
148+
actualFiles := collectAssets(t, testFileBaseDir, test.vmPath, test.flatten)
142149

143150
got := make(map[string]string)
144151
for _, actualFile := range actualFiles {

0 commit comments

Comments
 (0)