close root

Author: evict

cmd/src/servegit.go

@@ -62,6 +62,7 @@ Documentation at https://sourcegraph.com/docs/admin/code_hosts/src_serve_git
 		if err != nil {
 			return err
 		}
+		defer root.Close()
 
 		s := &servegit.Serve{
 			Addr:   *addrFlag,

internal/servegit/gitservice_test.go

@@ -36,6 +36,7 @@ func TestHandler(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	t.Cleanup(func() { rootFS.Close() })
 
 	ts := httptest.NewServer(&Handler{
 		Dir: func(_ context.Context, s string) (string, error) {
@@ -110,4 +111,4 @@ func runCmd(t *testing.T, dir string, cmd string, arg ...string) {
 	if err != nil {
 		t.Fatalf("%s %s failed: %s\nOutput: %s", cmd, strings.Join(arg, " "), err, b)
 	}
-}
+}

internal/servegit/serve_test.go

@@ -43,6 +43,7 @@ func TestReposHandler(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
+			t.Cleanup(func() { rootFS.Close() })
 
 			h := (&Serve{
 				Info:   testLogger(t),
@@ -177,9 +178,9 @@ func TestIgnoreGitSubmodules(t *testing.T) {
 
 	rootFS, err := os.OpenRoot(root)
 	if err != nil {
-
 		t.Fatal(err)
 	}
+	t.Cleanup(func() { rootFS.Close() })
 
 	repos, err := (&Serve{
 		Info:   testLogger(t),
@@ -224,4 +225,4 @@ type testWriter struct {
 func (tw testWriter) Write(p []byte) (n int, err error) {
 	tw.Log(string(p))
 	return len(p), nil
-}
+}