From fd0b70ef67c68b1822e9b131d5d3e6b02c8eb42f Mon Sep 17 00:00:00 2001
From: Brandon Croft <brandon.croft@gmail.com>
Date: Wed, 6 Jul 2022 17:15:27 -0600
Subject: [PATCH] test: TestConfigurationVersionsReadWithOptions should retry

---
 configuration_version_integration_test.go | 31 +++++++++++++----------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/configuration_version_integration_test.go b/configuration_version_integration_test.go
index fe028698e..b85e6790e 100644
--- a/configuration_version_integration_test.go
+++ b/configuration_version_integration_test.go
@@ -7,10 +7,12 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-	"github.com/hashicorp/go-slug"
+	"errors"
 	"testing"
 	"time"
 
+	"github.com/hashicorp/go-slug"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -155,22 +157,25 @@ func TestConfigurationVersionsReadWithOptions(t *testing.T) {
 	wTest, wTestCleanup := createWorkspaceWithVCS(t, client, orgTest, WorkspaceCreateOptions{QueueAllRuns: Bool(true)})
 	defer wTestCleanup()
 
-	// Hack: Wait for TFC to ingress the configuration and queue a run
-	time.Sleep(3 * time.Second)
+	w, err := retry(func() (interface{}, error) {
+		w, err := client.Workspaces.ReadByIDWithOptions(ctx, wTest.ID, &WorkspaceReadOptions{
+			Include: []WSIncludeOpt{WSCurrentRunConfigVer},
+		})
 
-	w, err := client.Workspaces.ReadByIDWithOptions(ctx, wTest.ID, &WorkspaceReadOptions{
-		Include: []WSIncludeOpt{WSCurrentRunConfigVer},
-	})
+		if err != nil {
+			return nil, err
+		}
 
-	if err != nil {
-		require.NoError(t, err)
-	}
+		if w.CurrentRun == nil {
+			return nil, errors.New("A run was expected to be found on this workspace as a test pre-condition")
+		}
 
-	if w.CurrentRun == nil {
-		t.Fatal("A run was expected to be found on this workspace as a test pre-condition")
-	}
+		return w, nil
+	})
+
+	require.NoError(t, err)
 
-	cv := w.CurrentRun.ConfigurationVersion
+	cv := w.(*Workspace).CurrentRun.ConfigurationVersion
 
 	t.Run("when the configuration version exists", func(t *testing.T) {
 		options := &ConfigurationVersionReadOptions{