From 1a183bbb67d4f247112e6a113095949bc021e866 Mon Sep 17 00:00:00 2001 From: Maxim Lebedev Date: Mon, 15 Nov 2021 02:12:51 +0500 Subject: [PATCH] :recycle: Refactored TestBolt util usage --- internal/util/test_bolt.go | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/internal/util/test_bolt.go b/internal/util/test_bolt.go index 50f30e4..e1160ae 100644 --- a/internal/util/test_bolt.go +++ b/internal/util/test_bolt.go @@ -9,10 +9,12 @@ import ( bolt "go.etcd.io/bbolt" ) -func TestBolt(tb testing.TB, buckets ...[]byte) (*bolt.DB, func()) { +// TestBolt returns a temporary empty database bbolt in the temporary directory +// with the cleanup function. +func TestBolt(tb testing.TB) (*bolt.DB, func()) { tb.Helper() - f, err := os.CreateTemp("", "bbolt_*.db") + f, err := os.CreateTemp(os.TempDir(), "bbolt_*.db") require.NoError(tb, err) filePath := f.Name() @@ -21,18 +23,9 @@ func TestBolt(tb testing.TB, buckets ...[]byte) (*bolt.DB, func()) { db, err := bolt.Open(filePath, os.ModePerm, nil) require.NoError(tb, err) - for _, bucket := range buckets { - bucket := bucket - - assert.NoError(tb, db.Update(func(tx *bolt.Tx) error { - _, err := tx.CreateBucket(bucket) - - return err //nolint: errcheck - })) - } - + //nolint: errcheck return db, func() { - db.Close() //nolint: errcheck - os.Remove(filePath) //nolint: errcheck + db.Close() + os.Remove(filePath) } }