Fix additional race in tests

josebalius · josebalius · commit 97cbdca84a2e · 2021-10-07T15:45:55.000-04:00
diff --git a/pkg/liveshare/session_test.go b/pkg/liveshare/session_test.go
@@ -367,7 +367,11 @@ func TestSessionHeartbeat(t *testing.T) {
 		if activityCount != 2 {
 			t.Errorf("unexpected number of activities, expected: 2, got: %d", activityCount)
 		}
-		if requests != 2 {
+
+		requestsMu.Lock()
+		rc := requests
+		requestsMu.Unlock()
+		if rc != 2 {
 			t.Errorf("unexpected number of requests, expected: 2, got: %d", requests)
 		}
 		return

Original file line number	Diff line number	Diff line change
`@@ -367,7 +367,11 @@ func TestSessionHeartbeat(t *testing.T) {`
`367`	`367`	`if activityCount != 2 {`
`368`	`368`	`t.Errorf("unexpected number of activities, expected: 2, got: %d", activityCount)`
`369`	`369`	`}`
`370`		`- if requests != 2 {`
	`370`	`+`
	`371`	`+ requestsMu.Lock()`
	`372`	`+ rc := requests`
	`373`	`+ requestsMu.Unlock()`
	`374`	`+ if rc != 2 {`
`371`	`375`	`t.Errorf("unexpected number of requests, expected: 2, got: %d", requests)`
`372`	`376`	`}`
`373`	`377`	`return`