tests: increase test resiliency

Author: ctrombley

helper_test.go

@@ -3140,18 +3140,22 @@ func retryTimesIf[T any](maxRetries, secondsBetween int, f retryableFn, c func(T
 	}
 }
 
-func retryPatiently(f retryableFn) (interface{}, error) { //nolint
+func retryPatiently(f retryableFn) (interface{}, error) {
 	return retryTimes(39, 3, f) // 40 attempts over 120 seconds
 }
 
-func retryIf[T any](f retryableFn, c func(T) bool) (T, error) { //nolint
-	return retryTimesIf[T](9, 3, f, c) // 10 attempts over 30 seconds
-}
-
 func retry(f retryableFn) (interface{}, error) { //nolint
 	return retryTimes(9, 3, f) // 10 attempts over 30 seconds
 }
 
+func retryPatientlyIf[T any](f retryableFn, c func(T) bool) (T, error) {
+	return retryTimesIf[T](39, 3, f, c) // 40 attempts over 120 seconds
+}
+
+func retryIf[T any](f retryableFn, c func(T) bool) (T, error) {
+	return retryTimesIf[T](9, 3, f, c) // 10 attempts over 30 seconds
+}
+
 func genSha(t *testing.T) string {
 	t.Helper()
 	h := hmac.New(sha256.New, []byte("secret"))

workspace_integration_test.go

@@ -2320,6 +2320,7 @@ func TestWorkspacesSafeDelete(t *testing.T) {
 
 func TestWorkspacesSafeDeleteByID(t *testing.T) {
 	t.Parallel()
+
 	client := testClient(t)
 	ctx := context.Background()
 
@@ -2360,7 +2361,7 @@ func TestWorkspacesSafeDeleteByID(t *testing.T) {
 		_, svTestCleanup := createStateVersion(t, client, 0, wTest)
 		t.Cleanup(svTestCleanup)
 
-		_, err := retry(func() (interface{}, error) {
+		_, err := retryPatiently(func() (interface{}, error) {
 			err := client.Workspaces.SafeDeleteByID(ctx, wTest.ID)
 			if errors.Is(err, ErrWorkspaceStillProcessing) {
 				return nil, err

workspace_resources_integration_test.go

@@ -33,7 +33,7 @@ func TestWorkspaceResourcesList(t *testing.T) {
 		// Retry while waiting for workspace resources to be populated.
 		// This can take some time after the state version is created, so we
 		// retry the list call until we get non-empty results.
-		rs, err := retryIf(
+		rs, err := retryPatientlyIf(
 			func() (any, error) {
 				return client.WorkspaceResources.List(ctx, wTest.ID, nil)
 			},
@@ -43,6 +43,8 @@ func TestWorkspaceResourcesList(t *testing.T) {
 		)
 
 		require.NoError(t, err)
+		require.NotNil(t, rs)
+		require.NotNil(t, rs.Items)
 		require.NotEmpty(t, rs.Items)
 		assert.Equal(t, 1, len(rs.Items))
 		assert.Equal(t, 1, rs.CurrentPage)