Merge pull request #43671 from thaJeztah/close_the_door_please

fix unclosed file-handles in tests

daemon/graphdriver/driver_test.go

@@ -28,8 +28,9 @@ func TestIsEmptyDir(t *testing.T) {
 	d = filepath.Join(tmp, "dir-with-empty-file")
 	err = os.Mkdir(d, 0755)
 	assert.NilError(t, err)
-	_, err = os.CreateTemp(d, "file")
+	f, err := os.CreateTemp(d, "file")
 	assert.NilError(t, err)
+	defer f.Close()
 	empty = isEmptyDir(d)
 	assert.Check(t, !empty)
 }

daemon/trustkey_test.go

@@ -18,6 +18,7 @@ func TestLoadOrCreateTrustKeyInvalidKeyFile(t *testing.T) {
 
 	tmpKeyFile, err := os.CreateTemp(tmpKeyFolderPath, "keyfile")
 	assert.NilError(t, err)
+	defer tmpKeyFile.Close()
 
 	_, err = loadOrCreateTrustKey(tmpKeyFile.Name())
 	assert.Check(t, is.ErrorContains(err, "Error loading key file"))

pkg/directory/directory_test.go

@@ -35,6 +35,7 @@ func TestSizeEmptyFile(t *testing.T) {
 	if file, err = os.CreateTemp(dir, "file"); err != nil {
 		t.Fatalf("failed to create file: %s", err)
 	}
+	defer file.Close()
 
 	var size int64
 	if size, _ = Size(context.Background(), file.Name()); size != 0 {
@@ -54,6 +55,7 @@ func TestSizeNonemptyFile(t *testing.T) {
 	if file, err = os.CreateTemp(dir, "file"); err != nil {
 		t.Fatalf("failed to create file: %s", err)
 	}
+	defer file.Close()
 
 	d := []byte{97, 98, 99, 100, 101}
 	file.Write(d)
@@ -96,6 +98,7 @@ func TestSizeFileAndNestedDirectoryEmpty(t *testing.T) {
 	if file, err = os.CreateTemp(dir, "file"); err != nil {
 		t.Fatalf("failed to create file: %s", err)
 	}
+	defer file.Close()
 
 	d := []byte{100, 111, 99, 107, 101, 114}
 	file.Write(d)
@@ -121,6 +124,7 @@ func TestSizeFileAndNestedDirectoryNonempty(t *testing.T) {
 	if file, err = os.CreateTemp(dir, "file"); err != nil {
 		t.Fatalf("failed to create file: %s", err)
 	}
+	defer file.Close()
 
 	data := []byte{100, 111, 99, 107, 101, 114}
 	file.Write(data)
@@ -129,6 +133,7 @@ func TestSizeFileAndNestedDirectoryNonempty(t *testing.T) {
 	if nestedFile, err = os.CreateTemp(dirNested, "file"); err != nil {
 		t.Fatalf("failed to create file in nested directory: %s", err)
 	}
+	defer nestedFile.Close()
 
 	nestedData := []byte{100, 111, 99, 107, 101, 114}
 	nestedFile.Write(nestedData)

volume/service/db_test.go

@@ -22,6 +22,7 @@ func TestSetGetMeta(t *testing.T) {
 	assert.NilError(t, err)
 
 	store := &VolumeStore{db: db}
+	defer store.Shutdown()
 
 	_, err = store.getMeta("test")
 	assert.Assert(t, is.ErrorContains(err, ""))

volume/service/restore_test.go

@@ -40,6 +40,7 @@ func TestRestore(t *testing.T) {
 
 	s, err = NewStore(dir, drivers)
 	assert.NilError(t, err)
+	defer s.Shutdown()
 
 	v, err := s.Get(ctx, "test1")
 	assert.NilError(t, err)

volume/service/store_test.go

@@ -121,6 +121,7 @@ func TestList(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer s.Shutdown()
 	ls, _, err = s.Find(ctx, nil)
 	if err != nil {
 		t.Fatal(err)