Merge pull request #1082 from wakatime/bugfix/fix-race-condition-tests

Fix race condition in test
wakatime · Jul 29, 2024 · 0a98e63 · 0a98e63
2 parents 4b4c192 + 070070c
commit 0a98e63
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/cmd/heartbeat/heartbeat_test.go b/cmd/heartbeat/heartbeat_test.go
@@ -137,10 +137,10 @@ func TestSendHeartbeats_RateLimited(t *testing.T) {
 		numCalls++
 	})
 
-	tmpFile, err := os.CreateTemp(t.TempDir(), "wakatime")
+	tmpFile, err := os.CreateTemp(t.TempDir(), "wakatime-internal-config")
 	require.NoError(t, err)
 
-	offlineQueueFile, err := os.CreateTemp(t.TempDir(), "")
+	offlineQueueFile, err := os.CreateTemp(t.TempDir(), "offline-queue-file")
 	require.NoError(t, err)
 
 	v := viper.New()

diff --git a/cmd/params/params_test.go b/cmd/params/params_test.go
@@ -2629,12 +2629,10 @@ func TestLoadHeartbeatParams_ExtraHeartbeats_StdinReadOnlyOnce(t *testing.T) {
 	data, err := os.ReadFile("testdata/extra_heartbeats.json")
 	require.NoError(t, err)
 
-	go func() {
-		_, err := w.Write(data)
-		require.NoError(t, err)
+	_, err = w.Write(data)
+	require.NoError(t, err)
 
-		w.Close()
-	}()
+	w.Close()
 
 	v := viper.New()
 	v.Set("entity", "/path/to/file")
@@ -2656,12 +2654,10 @@ func TestLoadHeartbeatParams_ExtraHeartbeats_StdinReadOnlyOnce(t *testing.T) {
 	data, err = os.ReadFile("testdata/extra_heartbeats_with_string_values.json")
 	require.NoError(t, err)
 
-	go func() {
-		_, err := w.Write(data)
-		require.NoError(t, err)
+	_, err = w.Write(data)
+	require.NoError(t, err)
 
-		w.Close()
-	}()
+	w.Close()
 
 	os.Stdin = r