tests: increase test resiliency

Author: ctrombley

run_integration_test.go

@@ -679,22 +679,15 @@ func TestRunsForceCancel_RunDependent(t *testing.T) {
 		err := client.Runs.Cancel(ctx, rTest.ID, RunCancelOptions{})
 		require.NoError(t, err)
 
-		for i := 1; ; i++ {
-			// Refresh the view of the run
-			rTest, err = client.Runs.Read(ctx, rTest.ID)
-			require.NoError(t, err)
-
-			// Check if the timestamp is present.
-			if !rTest.ForceCancelAvailableAt.IsZero() {
-				break
-			}
-
-			if i > 30 {
-				t.Fatal("Timeout waiting for run to be canceled")
-			}
-
-			time.Sleep(time.Second)
-		}
+		rTest, err := retryPatientlyIf(
+			func() (any, error) {
+				return client.Runs.Read(ctx, rTest.ID)
+			},
+			func(r *Run) bool {
+				return r.ForceCancelAvailableAt.IsZero()
+			},
+		)
+		require.NoError(t, err)
 
 		t.Run("force-cancel-available-at timestamp is present", func(t *testing.T) {
 			assert.True(t, rTest.ForceCancelAvailableAt.After(time.Now()))

workspace_integration_test.go

@@ -2936,7 +2936,16 @@ func TestWorkspaces_AddTags(t *testing.T) {
 		require.NoError(t, err)
 
 		// tag is now in the tag_names
-		w, err := client.Workspaces.Read(ctx, orgTest.Name, wTest.Name)
+		// retry in case the system is busy
+		w, err := retryPatientlyIf(
+			func() (any, error) {
+				return client.Workspaces.Read(ctx, orgTest.Name, wTest.Name)
+			},
+			func(w *Workspace) bool {
+				return len(w.TagNames) < 5
+			},
+		)
+
 		require.NoError(t, err)
 		assert.Equal(t, 5, len(w.TagNames))
 		sort.Strings(w.TagNames)