diff options
| -rw-r--r-- | internal/gitaly/config/temp_dir.go | 3 | ||||
| -rw-r--r-- | internal/gitaly/config/temp_dir_test.go | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/internal/gitaly/config/temp_dir.go b/internal/gitaly/config/temp_dir.go index d27100edf..96f5eb41f 100644 --- a/internal/gitaly/config/temp_dir.go +++ b/internal/gitaly/config/temp_dir.go @@ -26,8 +26,7 @@ func PruneOldGitalyProcessDirectories(log log.FieldLogger, directory string) err log := log.WithField("path", filepath.Join(directory, entry.Name())) if err := func() error { if !entry.IsDir() { - // There should be no files, only the gitaly process directories. - return errors.New("gitaly process directory contains an unexpected file") + return nil } components := strings.Split(entry.Name(), "-") diff --git a/internal/gitaly/config/temp_dir_test.go b/internal/gitaly/config/temp_dir_test.go index 9961278ce..2d7076139 100644 --- a/internal/gitaly/config/temp_dir_test.go +++ b/internal/gitaly/config/temp_dir_test.go @@ -62,10 +62,8 @@ func TestPruneOldGitalyProcessDirectories(t *testing.T) { prunableDirs = append(prunableDirs, rootRuntimeDir) // Create an unexpected file in the runtime directory - unexpectedFilePath := filepath.Join(baseDir, "unexpected-file") - require.NoError(t, os.WriteFile(unexpectedFilePath, []byte(""), os.ModePerm)) - expectedLogs[unexpectedFilePath] = "could not prune entry" - expectedErrs[unexpectedFilePath] = errors.New("gitaly process directory contains an unexpected file") + file := filepath.Join(baseDir, "file") + require.NoError(t, os.WriteFile(file, []byte(""), os.ModePerm)) nonPrunableDirs := []string{ownRuntimeDir} @@ -100,7 +98,7 @@ func TestPruneOldGitalyProcessDirectories(t *testing.T) { require.Equal(t, expectedLogs, actualLogs) require.Equal(t, expectedErrs, actualErrs) - require.FileExists(t, unexpectedFilePath) + require.FileExists(t, file) for _, nonPrunableEntry := range nonPrunableDirs { require.DirExists(t, nonPrunableEntry, nonPrunableEntry) |