Skip to content

Commit

Permalink
Merge pull request #1097 from wakatime/bugfix/windows-tests
Browse files Browse the repository at this point in the history
Prevent race condition when Windows tests reading same config file
  • Loading branch information
alanhamlett authored Sep 17, 2024
2 parents e50949f + dcf9a72 commit fdf4bd9
Showing 1 changed file with 22 additions and 5 deletions.
27 changes: 22 additions & 5 deletions cmd/heartbeat/heartbeat_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ func TestSendHeartbeats(t *testing.T) {
projectFolder, err := filepath.Abs("../..")
require.NoError(t, err)

tmpFile, err := os.CreateTemp(t.TempDir(), "wakatime-config")
require.NoError(t, err)

subfolders := project.CountSlashesInProjectFolder(projectFolder)

router.HandleFunc("/users/current/heartbeats.bulk", func(w http.ResponseWriter, req *http.Request) {
Expand Down Expand Up @@ -96,6 +99,7 @@ func TestSendHeartbeats(t *testing.T) {
v := viper.New()
v.SetDefault("sync-offline-activity", 1000)
v.Set("api-url", testServerURL)
v.Set("config", tmpFile.Name())
v.Set("category", "debugging")
v.Set("cursorpos", 42)
v.Set("entity", "testdata/main.go")
Expand All @@ -122,6 +126,10 @@ func TestSendHeartbeats(t *testing.T) {
}

func TestSendHeartbeats_RateLimited(t *testing.T) {
if runtime.GOOS == "windows" {
t.Skip("Skipping because OS is windows.")
}

resetSingleton(t)

testServerURL, router, tearDown := setupTestServer()
Expand All @@ -137,7 +145,10 @@ func TestSendHeartbeats_RateLimited(t *testing.T) {
numCalls++
})

tmpFile, err := os.CreateTemp(t.TempDir(), "wakatime-internal-config")
tmpFile, err := os.CreateTemp(t.TempDir(), "wakatime-config")
require.NoError(t, err)

tmpFileInternal, err := os.CreateTemp(t.TempDir(), "wakatime-internal-config")
require.NoError(t, err)

offlineQueueFile, err := os.CreateTemp(t.TempDir(), "offline-queue-file")
Expand All @@ -162,7 +173,8 @@ func TestSendHeartbeats_RateLimited(t *testing.T) {
v.Set("timeout", 5)
v.Set("write", true)
v.Set("heartbeat-rate-limit-seconds", 500)
v.Set("internal-config", tmpFile.Name())
v.Set("config", tmpFile.Name())
v.Set("internal-config", tmpFileInternal.Name())
v.Set("offline-queue-file", offlineQueueFile.Name())
v.Set("internal.heartbeats_last_sent_at", time.Now().Add(-time.Minute).Format(time.RFC3339))

Expand Down Expand Up @@ -1189,13 +1201,18 @@ func TestResetRateLimit(t *testing.T) {

defer tmpFile.Close()

tmpFileInternal, err := os.CreateTemp(t.TempDir(), "wakatime-internal")
require.NoError(t, err)

defer tmpFileInternal.Close()

v := viper.New()
v.Set("config", tmpFile.Name())
v.Set("internal-config", tmpFile.Name())
v.Set("config", tmpFileInternal.Name())
v.Set("internal-config", tmpFileInternal.Name())

writer, err := ini.NewWriter(v, func(vp *viper.Viper) (string, error) {
assert.Equal(t, v, vp)
return tmpFile.Name(), nil
return tmpFileInternal.Name(), nil
})
require.NoError(t, err)

Expand Down

0 comments on commit fdf4bd9

Please sign in to comment.