chore: fix race condition in cron tests (#1369)

mockDal's `attemptCountMap` was being read without getting a lock

backend/controller/cronjobs/cronjobs_test.go

@@ -21,7 +21,6 @@ import (
 )
 
 func TestServiceWithMockDal(t *testing.T) {
-	t.Skip("TODO(matt2e): Fails -race, fix me")
 	t.Parallel()
 	ctx := log.ContextWithNewDefaultLogger(context.Background())
 	ctx, cancel := context.WithCancel(ctx)
@@ -40,7 +39,6 @@ func TestServiceWithMockDal(t *testing.T) {
 }
 
 func TestHashRing(t *testing.T) {
-	t.Skip("TODO(matt2e): Fails -race, fix me")
 	// This test uses multiple mock clocks to progress time for each controller individually
 	// This allows us to compare attempts for each cron job and know which controller attempted it
 	t.Parallel()
@@ -82,20 +80,24 @@ func TestHashRing(t *testing.T) {
 	// to build a map of verb to controller keys
 	controllersForVerbs := map[string][]model.ControllerKey{}
 	for _, c := range controllers {
+		mockDal.lock.Lock()
 		beforeAttemptCount := map[string]int{}
 		for k, v := range mockDal.attemptCountMap {
 			beforeAttemptCount[k] = v
 		}
+		mockDal.lock.Unlock()
 
 		c.mockClock.Add(time.Second * 15)
 		time.Sleep(time.Millisecond * 100)
 
+		mockDal.lock.Lock()
 		for k, v := range mockDal.attemptCountMap {
 			if beforeAttemptCount[k] == v {
 				continue
 			}
 			controllersForVerbs[k] = append(controllersForVerbs[k], c.key)
 		}
+		mockDal.lock.Unlock()
 	}
 
 	// Check if each job has the same key list

backend/controller/cronjobs/cronjobs_utils_test.go

@@ -252,8 +252,10 @@ func testServiceWithDal(ctx context.Context, t *testing.T, dal ExtendedDAL, clk
 		time.Sleep(time.Second * 2 * 3)
 	}
 
+	verbCallCountLock.Lock()
 	for _, j := range jobsToCreate {
 		count := verbCallCount[j.Verb.Name]
 		assert.Equal(t, count, 3, "expected verb %s to be called 3 times", j.Verb.Name)
 	}
+	verbCallCountLock.Unlock()
 }