Merge pull request #4723 from hashicorp/fix-race-job-test

Remove race condition in job test
hashicorp · May 15, 2023 · cd92950 · cd92950
2 parents edd65d1 + a3c862d
commit cd92950
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/pkg/serverstate/statetest/test_job.go b/pkg/serverstate/statetest/test_job.go
@@ -2680,10 +2680,12 @@ func TestJobHeartbeatOnRestart(t *testing.T, factory Factory, rf RestartFactory)
 		s = rf(t, s)
 		defer s.Close()
 
-		// Verify it exists
-		job, err = s.JobById(ctx, "A", nil)
-		require.NoError(err)
-		require.Equal(pb.Job_RUNNING, job.Job.State)
+		// Verify it exists. We use a closure here to avoid a possible race condition with the job object
+		{
+			job, err := s.JobById(ctx, "A", nil)
+			require.NoError(err)
+			require.Equal(pb.Job_RUNNING, job.Job.State)
+		}
 
 		// Should time out
 		require.Eventually(func() bool {