From 685b13a4ef0053a4a38623bcebda621db6f7eaf7 Mon Sep 17 00:00:00 2001 From: JmPotato Date: Sun, 23 May 2021 14:29:23 +0800 Subject: [PATCH] Clean and simplify some code (#279) * Clean and simplify some code Signed-off-by: JmPotato * Remove unused Makefile content Signed-off-by: JmPotato --- Makefile | 2 -- db_test.go | 2 +- tx_test.go | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 2968aaa..21ecf48 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,6 @@ BRANCH=`git rev-parse --abbrev-ref HEAD` COMMIT=`git rev-parse --short HEAD` GOLDFLAGS="-X main.branch $(BRANCH) -X main.commit $(COMMIT)" -default: build - race: @TEST_FREELIST_TYPE=hashmap go test -v -race -test.run="TestSimulate_(100op|1000op)" @echo "array freelist test" diff --git a/db_test.go b/db_test.go index 8427108..7af780b 100644 --- a/db_test.go +++ b/db_test.go @@ -395,7 +395,7 @@ func TestOpen_FileTooSmall(t *testing.T) { t.Fatal(err) } - db, err = bolt.Open(path, 0666, nil) + _, err = bolt.Open(path, 0666, nil) if err == nil || err.Error() != "file size too small" { t.Fatalf("unexpected error: %s", err) } diff --git a/tx_test.go b/tx_test.go index 38a25c6..14345d0 100644 --- a/tx_test.go +++ b/tx_test.go @@ -45,8 +45,7 @@ func TestTx_Check_ReadOnly(t *testing.T) { numChecks := 2 errc := make(chan error, numChecks) check := func() { - err, _ := <-tx.Check() - errc <- err + errc <- <-tx.Check() } // Ensure the freelist is not reloaded and does not race. for i := 0; i < numChecks; i++ {