verify that Close() calls idempotent

It was already the case but never checked.

avatar/bolt_test.go

@@ -82,6 +82,15 @@ func TestBoltDB_List(t *testing.T) {
 	assert.Equal(t, "some picture bin data 3", string(data))
 }
 
+func TestBoltDB_DoubleClose(t *testing.T) {
+	_ = os.Remove(testDB)
+	boltStore, err := NewBoltDB(testDB, bolt.Options{})
+	require.Nil(t, err)
+	assert.NoError(t, boltStore.Close())
+	assert.NoError(t, boltStore.Close(), "second call should not result in panic or errors")
+	_ = os.Remove(testDB)
+}
+
 // makes new boltdb, put two records
 func prepBoltStore(t *testing.T) (blt *BoltDB, teardown func()) {
 	_ = os.Remove(testDB)

avatar/gridfs.go

@@ -142,7 +142,7 @@ func (gf *GridFS) List() (ids []string, err error) {
 	return ids, nil
 }
 
-// Close gridfs does nothing but satisfies interface
+// Close gridfs store
 func (gf *GridFS) Close() error {
 	ctx, cancel := context.WithTimeout(context.Background(), gf.timeout)
 	defer cancel()

avatar/gridfs_test.go

@@ -20,6 +20,7 @@ func TestGridFS_PutAndGet(t *testing.T) {
 		t.Skip("ENABLE_MONGO_TESTS env variable is not set")
 	}
 	p := prepGFStore(t)
+	defer p.Close()
 	avatar, err := p.Put("user1", strings.NewReader("some picture bin data"))
 	require.Nil(t, err)
 	assert.Equal(t, "b3daa77b4c04a9551b8781d03191fe098f325e67.image", avatar)
@@ -47,6 +48,7 @@ func TestGridFS_Remove(t *testing.T) {
 		t.Skip("ENABLE_MONGO_TESTS env variable is not set")
 	}
 	p := prepGFStore(t)
+	defer p.Close()
 	assert.Error(t, p.Remove("no-such-thing.image"))
 	avatar, err := p.Put("user1", strings.NewReader("some picture bin data"))
 	require.Nil(t, err)
@@ -60,6 +62,7 @@ func TestGridFS_List(t *testing.T) {
 		t.Skip("ENABLE_MONGO_TESTS env variable is not set")
 	}
 	p := prepGFStore(t)
+	defer p.Close()
 
 	// write some avatars
 	_, err := p.Put("user1", strings.NewReader("some picture bin data 1"))
@@ -83,8 +86,16 @@ func TestGridFS_List(t *testing.T) {
 	assert.Equal(t, "some picture bin data 3", string(data))
 }
 
-func prepGFStore(t *testing.T) *GridFS {
+func TestGridFS_DoubleClose(t *testing.T) {
+	if _, ok := os.LookupEnv("ENABLE_MONGO_TESTS"); !ok {
+		t.Skip("ENABLE_MONGO_TESTS env variable is not set")
+	}
+	p := prepGFStore(t)
+	assert.NoError(t, p.Close())
+	assert.NoError(t, p.Close(), "second call should not result in panic or errors")
+}
 
+func prepGFStore(t *testing.T) *GridFS {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 	defer cancel()
 

avatar/localfs.go

@@ -104,7 +104,7 @@ func (fs *LocalFS) List() (ids []string, err error) {
 	return ids, nil
 }
 
-// Close gridfs does nothing but satisfies interface
+// Close LocalFS does nothing but satisfies interface
 func (fs *LocalFS) Close() error {
 	return nil
 }

avatar/noop_test.go

@@ -11,8 +11,8 @@ import (
 
 func TestNoOp_Close(t *testing.T) {
 	p := NewNoOp()
-	err := p.Close()
-	require.NoError(t, err)
+	require.NoError(t, p.Close())
+	require.NoError(t, p.Close(), "second call should not result in panic or errors")
 }
 
 func TestNoOp_Get(t *testing.T) {