@@ -46,9 +46,18 @@ func TestAssetsFromDir(t *testing.T) {
4646 relativePath string
4747 expectedPath string
4848 }{
49- {relativePath : "/dir1/file1.txt" , expectedPath : vmpath .GuestAddonsDir },
50- {relativePath : "/dir1/file2.txt" , expectedPath : vmpath .GuestAddonsDir },
51- {relativePath : "/dir2/file1.txt" , expectedPath : vmpath .GuestAddonsDir },
49+ {
50+ relativePath : "/dir1/file1.txt" ,
51+ expectedPath : vmpath .GuestAddonsDir ,
52+ },
53+ {
54+ relativePath : "/dir1/file2.txt" ,
55+ expectedPath : vmpath .GuestAddonsDir ,
56+ },
57+ {
58+ relativePath : "/dir2/file1.txt" ,
59+ expectedPath : vmpath .GuestAddonsDir ,
60+ },
5261 },
5362 vmPath : vmpath .GuestAddonsDir ,
5463 },
@@ -60,9 +69,18 @@ func TestAssetsFromDir(t *testing.T) {
6069 relativePath string
6170 expectedPath string
6271 }{
63- {relativePath : "/dir1/file1.txt" , expectedPath : "/dir1" },
64- {relativePath : "/dir1/file2.txt" , expectedPath : "/dir1" },
65- {relativePath : "/dir2/file1.txt" , expectedPath : "/dir2" },
72+ {
73+ relativePath : "/dir1/file1.txt" ,
74+ expectedPath : "/dir1" ,
75+ },
76+ {
77+ relativePath : "/dir1/file2.txt" ,
78+ expectedPath : "/dir1" ,
79+ },
80+ {
81+ relativePath : "/dir2/file1.txt" ,
82+ expectedPath : "/dir2" ,
83+ },
6684 },
6785 vmPath : "/" ,
6886 },
@@ -86,10 +104,11 @@ func TestAssetsFromDir(t *testing.T) {
86104 for _ , fileDef := range test .files {
87105 err := func () error {
88106 path := filepath .Join (testFileBaseDir , fileDef .relativePath )
89- if err := os .MkdirAll (filepath .Dir (path ), 0o755 ); err != nil {
107+ err := os .MkdirAll (filepath .Dir (path ), 0755 )
108+ want [path ] = fileDef .expectedPath
109+ if err != nil {
90110 return err
91111 }
92- want [path ] = fileDef .expectedPath
93112
94113 file , err := os .Create (path )
95114 if err != nil {
@@ -102,7 +121,8 @@ func TestAssetsFromDir(t *testing.T) {
102121 return err
103122 }()
104123 if err != nil {
105- t .Fatalf ("unable to create file on fs: %v" , err )
124+ t .Errorf ("unable to create file on fs: %v" , err )
125+ return
106126 }
107127 }
108128
@@ -111,7 +131,6 @@ func TestAssetsFromDir(t *testing.T) {
111131 t .Fatalf ("got unexpected error adding minikube dir assets: %v" , err )
112132 }
113133
114- // Ensure file descriptors opened by assets.NewFileAsset are released (critical on Windows).
115134 t .Cleanup (func () {
116135 for _ , f := range actualFiles {
117136 if cerr := f .Close (); cerr != nil {
0 commit comments