From 070070c44e14b5e3aaad2741fba1e5b33497e989 Mon Sep 17 00:00:00 2001 From: Alan Hamlett Date: Mon, 29 Jul 2024 12:36:58 +0200 Subject: [PATCH] Fix race condition in test --- cmd/heartbeat/heartbeat_test.go | 4 ++-- cmd/params/params_test.go | 16 ++++++---------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/cmd/heartbeat/heartbeat_test.go b/cmd/heartbeat/heartbeat_test.go index 2adb6996..b3acf85a 100644 --- 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 index 7e31d4c5..60ff54d8 100644 --- 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