Merge pull request #1074 from wakatime/bugfix/fix-tests-with-once

Fix tests with Once singleton

cmd/heartbeat/heartbeat_test.go

@@ -10,11 +10,13 @@ import (
 	"path/filepath"
 	"runtime"
 	"strings"
+	"sync"
 	"testing"
 	"time"
 
 	"github.com/wakatime/wakatime-cli/cmd"
 	cmdheartbeat "github.com/wakatime/wakatime-cli/cmd/heartbeat"
+	cmdparams "github.com/wakatime/wakatime-cli/cmd/params"
 	"github.com/wakatime/wakatime-cli/pkg/api"
 	"github.com/wakatime/wakatime-cli/pkg/heartbeat"
 	"github.com/wakatime/wakatime-cli/pkg/ini"
@@ -290,6 +292,8 @@ func TestSendHeartbeats_ExtraHeartbeats(t *testing.T) {
 
 	os.Stdin = r
 
+	cmdparams.Once = sync.Once{}
+
 	data, err := os.ReadFile("testdata/extra_heartbeats.json")
 	require.NoError(t, err)
 
@@ -372,6 +376,8 @@ func TestSendHeartbeats_ExtraHeartbeats_Sanitize(t *testing.T) {
 
 	os.Stdin = r
 
+	cmdparams.Once = sync.Once{}
+
 	data, err := os.ReadFile("testdata/extra_heartbeats.json")
 	require.NoError(t, err)
 
@@ -580,6 +586,8 @@ func TestSendHeartbeats_IsUnsavedEntity(t *testing.T) {
 
 	os.Stdin = inr
 
+	cmdparams.Once = sync.Once{}
+
 	data, err := os.ReadFile("testdata/extra_heartbeats_is_unsaved_entity.json")
 	require.NoError(t, err)
 
@@ -710,6 +718,8 @@ func TestSendHeartbeats_NonExistingExtraHeartbeatsEntity(t *testing.T) {
 
 	os.Stdin = inr
 
+	cmdparams.Once = sync.Once{}
+
 	data, err := os.ReadFile("testdata/extra_heartbeats_nonexisting_entity.json")
 	require.NoError(t, err)
 

cmd/params/params.go

@@ -751,10 +751,12 @@ func readAPIKeyFromCommand(cmdStr string) (string, error) {
 }
 
 var extraHeartbeatsCache *[]heartbeat.Heartbeat // nolint:gochecknoglobals
-var once sync.Once                              // nolint:gochecknoglobals
+
+// Once prevents reading from stdin twice.
+var Once sync.Once // nolint:gochecknoglobals
 
 func readExtraHeartbeats() []heartbeat.Heartbeat {
-	once.Do(func() {
+	Once.Do(func() {
 		in := bufio.NewReader(os.Stdin)
 
 		input, err := in.ReadString('\n')