huh

aslilac · aslilac · commit 70e9cd6124ef · 2023-10-02T23:01:15.000Z
diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go
@@ -771,9 +771,21 @@ func AwaitTemplateVersionJobRunning(t *testing.T, client *codersdk.Client, versi
 	require.Eventually(t, func() bool {
 		var err error
 		templateVersion, err = client.TemplateVersion(ctx, version)
+		if err != nil {
+			return false
+		}
 		t.Logf("template version job status: %s", templateVersion.Job.Status)
-		return assert.NoError(t, err) && templateVersion.Job.Status == codersdk.ProvisionerJobRunning
+		switch templateVersion.Job.Status {
+		case codersdk.ProvisionerJobPending:
+			return false
+		case codersdk.ProvisionerJobRunning:
+			return true
+		default:
+			t.FailNow()
+			return false
+		}
 	}, testutil.WaitShort, testutil.IntervalFast, "make sure you set `IncludeProvisionerDaemon`!")
+	t.Logf("template version %s job has started", version)
 	return templateVersion
 }
 
@@ -792,7 +804,7 @@ func AwaitTemplateVersionJobCompleted(t *testing.T, client *codersdk.Client, ver
 		t.Logf("template version job status: %s", templateVersion.Job.Status)
 		return assert.NoError(t, err) && templateVersion.Job.CompletedAt != nil
 	}, testutil.WaitLong, testutil.IntervalMedium, "make sure you set `IncludeProvisionerDaemon`!")
-	t.Logf("got template version job %s", version)
+	t.Logf("template version %s job has completed", version)
 	return templateVersion
 }
 
diff --git a/coderd/templateversions_test.go b/coderd/templateversions_test.go
@@ -562,7 +562,6 @@ func TestPatchActiveTemplateVersion(t *testing.T) {
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
 		template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
 		version = coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, nil, template.ID)
-		_ = coderdtest.AwaitTemplateVersionJobRunning(t, client, version.ID)
 
 		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 		defer cancel()
@@ -578,16 +577,13 @@ func TestPatchActiveTemplateVersion(t *testing.T) {
 		require.Equal(t, http.StatusPreconditionFailed, apiErr.StatusCode())
 	})
 
-	t.Run("RunningBuild", func(t *testing.T) {
+	t.Run("PendingBuild", func(t *testing.T) {
 		t.Parallel()
-		client := coderdtest.New(t, &coderdtest.Options{
-			IncludeProvisionerDaemon: true,
-		})
+		client := coderdtest.New(t, nil)
 		user := coderdtest.CreateFirstUser(t, client)
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
 		template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
 		version = coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, nil, template.ID)
-		_ = coderdtest.AwaitTemplateVersionJobRunning(t, client, version.ID)
 
 		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 		defer cancel()
