Skip to content

Commit

Permalink
Merge pull request #1060 from wakatime/misc/bolt-db-close-test
Browse files Browse the repository at this point in the history
Validate error when closing bolt db in tests
  • Loading branch information
gandarez authored Jul 10, 2024
2 parents d1ec33f + d12c3c7 commit 8d8ecab
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 8 deletions.
5 changes: 4 additions & 1 deletion cmd/heartbeat/heartbeat_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,10 @@ func TestSendHeartbeats_ExtraHeartbeats_Sanitize(t *testing.T) {
db, err := bolt.Open(offlineQueueFile.Name(), 0600, nil)
require.NoError(t, err)

defer db.Close()
defer func() {
err = db.Close()
require.NoError(t, err)
}()

tx, err := db.Begin(true)
require.NoError(t, err)
Expand Down
7 changes: 5 additions & 2 deletions cmd/offlinecount/offlinecount_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ func TestOfflineCount_Empty(t *testing.T) {
require.NoError(t, err)

insertHeartbeatRecords(t, db, "heartbeats", []heartbeatRecord{})
db.Close()

err = db.Close()
require.NoError(t, err)

v := viper.New()
v.Set("verbose", true)
Expand Down Expand Up @@ -89,7 +91,8 @@ func TestOfflineCount(t *testing.T) {
},
})

db.Close()
err = db.Close()
require.NoError(t, err)

v := viper.New()
v.Set("offline-count", true)
Expand Down
3 changes: 2 additions & 1 deletion cmd/offlineprint/offlineprint_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ func TestPrintOfflineHeartbeats(t *testing.T) {
},
})

db.Close()
err = db.Close()
require.NoError(t, err)

v := viper.New()
v.Set("print-offline-heartbeats", 10)
Expand Down
6 changes: 4 additions & 2 deletions cmd/offlinesync/offlinesync_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ func TestSyncOfflineActivity(t *testing.T) {
},
})

db.Close()
err = db.Close()
require.NoError(t, err)

v := viper.New()
v.Set("api-url", testServerURL)
Expand Down Expand Up @@ -181,7 +182,8 @@ func TestSyncOfflineActivity_MultipleApiKey(t *testing.T) {
},
})

db.Close()
err = db.Close()
require.NoError(t, err)

v := viper.New()
v.Set("api-url", testServerURL)
Expand Down
6 changes: 4 additions & 2 deletions cmd/run_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,8 @@ func TestRunCmdWithOfflineSync(t *testing.T) {
},
})

db.Close()
err = db.Close()
require.NoError(t, err)

// setup test server
testServerURL, router, tearDown := setupTestServer()
Expand Down Expand Up @@ -738,7 +739,8 @@ func TestRunCmdWithOfflineSync(t *testing.T) {
})
require.NoError(t, err)

db.Close()
err = db.Close()
require.NoError(t, err)

require.Len(t, stored, 0)

Expand Down

0 comments on commit 8d8ecab

Please sign in to comment.