Skip to content
This repository was archived by the owner on Sep 9, 2020. It is now read-only.

prune: Handle testdata directories #1649

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions gps/prune.go
Original file line number Diff line number Diff line change
Expand Up @@ -333,22 +333,36 @@ func isPreservedFile(name string) bool {
return false
}

// pruneGoTestFiles deletes all Go test files (*_test.go) in fsState.
// pruneGoTestFiles deletes all Go test files (*_test.go and testdata/**/*)
// in fsState.
func pruneGoTestFiles(fsState filesystemState) error {
toDelete := make([]string, 0, len(fsState.files)/2)
filesToDelete := make([]string, 0, len(fsState.files)/2)
dirsToDelete := make([]string, 0)

for _, path := range fsState.files {
if strings.HasSuffix(path, "_test.go") {
toDelete = append(toDelete, filepath.Join(fsState.root, path))
filesToDelete = append(filesToDelete, filepath.Join(fsState.root, path))
}
}

for _, path := range toDelete {
for _, path := range fsState.dirs {
if filepath.Base(path) == "testdata" {
dirsToDelete = append(dirsToDelete, filepath.Join(fsState.root, path))
}
}

for _, path := range filesToDelete {
if err := os.Remove(path); err != nil && !os.IsNotExist(err) {
return err
}
}

for _, path := range dirsToDelete {
if err := os.RemoveAll(path); err != nil && !os.IsNotExist(err) {
return err
}
}

return nil
}

Expand Down
25 changes: 25 additions & 0 deletions gps/prune_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,31 @@ func TestPruneGoTestFiles(t *testing.T) {
},
false,
},
{
"testdata-files",
fsTestCase{
before: filesystemState{
dirs: []string{
"dir",
"dir/testdata",
},
files: []string{
"dir/main.go",
"dir/main_test.go",
"dir/testdata/foo",
},
},
after: filesystemState{
dirs: []string{
"dir",
},
files: []string{
"dir/main.go",
},
},
},
false,
},
}

for _, tc := range testcases {
Expand Down