File tree 1 file changed +24
-7
lines changed
1 file changed +24
-7
lines changed Original file line number Diff line number Diff line change @@ -312,16 +312,33 @@ func TestMain(m *testing.M) {
312
312
313
313
if ! * testWork {
314
314
// There shouldn't be anything left in topTmpdir.
315
- dirf , err := os .Open (topTmpdir )
316
- if err != nil {
317
- log .Fatal (err )
318
- }
319
- names , err := dirf .Readdirnames (0 )
315
+ var extraFiles , extraDirs []string
316
+ err := filepath .WalkDir (topTmpdir , func (path string , d fs.DirEntry , err error ) error {
317
+ if err != nil {
318
+ return err
319
+ }
320
+ if path == topTmpdir {
321
+ return nil
322
+ }
323
+
324
+ if rel , err := filepath .Rel (topTmpdir , path ); err == nil {
325
+ path = rel
326
+ }
327
+ if d .IsDir () {
328
+ extraDirs = append (extraDirs , path )
329
+ } else {
330
+ extraFiles = append (extraFiles , path )
331
+ }
332
+ return nil
333
+ })
320
334
if err != nil {
321
335
log .Fatal (err )
322
336
}
323
- if len (names ) > 0 {
324
- log .Fatalf ("unexpected files left in tmpdir: %v" , names )
337
+
338
+ if len (extraFiles ) > 0 {
339
+ log .Fatalf ("unexpected files left in tmpdir: %q" , extraFiles )
340
+ } else if len (extraDirs ) > 0 {
341
+ log .Fatalf ("unexpected subdirectories left in tmpdir: %q" , extraDirs )
325
342
}
326
343
327
344
removeAll (topTmpdir )
You can’t perform that action at this time.
0 commit comments