Skip to content

Commit 70e9cd6

Browse files
committed
huh
1 parent 86d0baf commit 70e9cd6

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

coderd/coderdtest/coderdtest.go

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -771,9 +771,21 @@ func AwaitTemplateVersionJobRunning(t *testing.T, client *codersdk.Client, versi
771771
require.Eventually(t, func() bool {
772772
var err error
773773
templateVersion, err = client.TemplateVersion(ctx, version)
774+
if err != nil {
775+
return false
776+
}
774777
t.Logf("template version job status: %s", templateVersion.Job.Status)
775-
return assert.NoError(t, err) && templateVersion.Job.Status == codersdk.ProvisionerJobRunning
778+
switch templateVersion.Job.Status {
779+
case codersdk.ProvisionerJobPending:
780+
return false
781+
case codersdk.ProvisionerJobRunning:
782+
return true
783+
default:
784+
t.FailNow()
785+
return false
786+
}
776787
}, testutil.WaitShort, testutil.IntervalFast, "make sure you set `IncludeProvisionerDaemon`!")
788+
t.Logf("template version %s job has started", version)
777789
return templateVersion
778790
}
779791

@@ -792,7 +804,7 @@ func AwaitTemplateVersionJobCompleted(t *testing.T, client *codersdk.Client, ver
792804
t.Logf("template version job status: %s", templateVersion.Job.Status)
793805
return assert.NoError(t, err) && templateVersion.Job.CompletedAt != nil
794806
}, testutil.WaitLong, testutil.IntervalMedium, "make sure you set `IncludeProvisionerDaemon`!")
795-
t.Logf("got template version job %s", version)
807+
t.Logf("template version %s job has completed", version)
796808
return templateVersion
797809
}
798810

coderd/templateversions_test.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,6 @@ func TestPatchActiveTemplateVersion(t *testing.T) {
562562
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
563563
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
564564
version = coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, nil, template.ID)
565-
_ = coderdtest.AwaitTemplateVersionJobRunning(t, client, version.ID)
566565

567566
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
568567
defer cancel()
@@ -578,16 +577,13 @@ func TestPatchActiveTemplateVersion(t *testing.T) {
578577
require.Equal(t, http.StatusPreconditionFailed, apiErr.StatusCode())
579578
})
580579

581-
t.Run("RunningBuild", func(t *testing.T) {
580+
t.Run("PendingBuild", func(t *testing.T) {
582581
t.Parallel()
583-
client := coderdtest.New(t, &coderdtest.Options{
584-
IncludeProvisionerDaemon: true,
585-
})
582+
client := coderdtest.New(t, nil)
586583
user := coderdtest.CreateFirstUser(t, client)
587584
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
588585
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
589586
version = coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, nil, template.ID)
590-
_ = coderdtest.AwaitTemplateVersionJobRunning(t, client, version.ID)
591587

592588
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
593589
defer cancel()

0 commit comments

Comments
 (0)