From 1133643927265d6c2d979d0343d708128c050f15 Mon Sep 17 00:00:00 2001 From: Eng Zer Jun Date: Sat, 27 Aug 2022 15:06:45 +0800 Subject: [PATCH] macaroons: replace defer cleanup with `t.Cleanup` Signed-off-by: Eng Zer Jun --- macaroons/service_test.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/macaroons/service_test.go b/macaroons/service_test.go index d84aa6e25..b35136717 100644 --- a/macaroons/service_test.go +++ b/macaroons/service_test.go @@ -37,14 +37,17 @@ func setupTestRootKeyStorage(t *testing.T) kvdb.Backend { kvdb.DefaultDBTimeout, ) require.NoError(t, err, "Error opening store DB") + t.Cleanup(func() { + require.NoError(t, db.Close()) + }) + store, err := macaroons.NewRootKeyStorage(db) - if err != nil { - db.Close() - t.Fatalf("Error creating root key store: %v", err) - } - defer store.Close() + require.NoError(t, err, "Error creating root key store") + err = store.CreateUnlock(&defaultPw) + require.NoError(t, store.Close()) require.NoError(t, err, "error creating unlock") + return db }