Skip to content

Commit df7ed18

Browse files
johnstcnjohnstcn
authored
chore(coderd/autobuild): wait for active template version and inactive template version (#11210)
1 parent 5b0e6bf commit df7ed18

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

‎coderd/autobuild/lifecycle_executor_test.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -283,8 +283,8 @@ func TestExecutorAutostartUserSuspended(t *testing.T) {
283283

284284
admin := coderdtest.CreateFirstUser(t, client)
285285
version := coderdtest.CreateTemplateVersion(t, client, admin.OrganizationID, nil)
286-
template := coderdtest.CreateTemplate(t, client, admin.OrganizationID, version.ID)
287286
coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
287+
template := coderdtest.CreateTemplate(t, client, admin.OrganizationID, version.ID)
288288
userClient, user := coderdtest.CreateAnotherUser(t, client, admin.OrganizationID)
289289
workspace := coderdtest.CreateWorkspace(t, userClient, admin.OrganizationID, template.ID, func(cwr *codersdk.CreateWorkspaceRequest) {
290290
cwr.AutostartSchedule = ptr.Ref(sched.String())
@@ -863,14 +863,15 @@ func TestExecutorRequireActiveVersion(t *testing.T) {
863863
// template version and assert that the field is not abided
864864
// since there is no enterprise license.
865865
activeVersion := coderdtest.CreateTemplateVersion(t, ownerClient, owner.OrganizationID, nil)
866+
coderdtest.AwaitTemplateVersionJobCompleted(t, ownerClient, activeVersion.ID)
866867
template := coderdtest.CreateTemplate(t, ownerClient, owner.OrganizationID, activeVersion.ID, func(ctr *codersdk.CreateTemplateRequest) {
867868
ctr.RequireActiveVersion = true
868869
ctr.VersionID = activeVersion.ID
869870
})
870871
inactiveVersion := coderdtest.CreateTemplateVersion(t, ownerClient, owner.OrganizationID, nil, func(ctvr *codersdk.CreateTemplateVersionRequest) {
871872
ctvr.TemplateID = template.ID
872873
})
873-
coderdtest.AwaitTemplateVersionJobCompleted(t, ownerClient, activeVersion.ID)
874+
coderdtest.AwaitTemplateVersionJobCompleted(t, ownerClient, inactiveVersion.ID)
874875
memberClient, _ := coderdtest.CreateAnotherUser(t, ownerClient, owner.OrganizationID)
875876
ws := coderdtest.CreateWorkspace(t, memberClient, owner.OrganizationID, uuid.Nil, func(cwr *codersdk.CreateWorkspaceRequest) {
876877
cwr.TemplateVersionID = inactiveVersion.ID
@@ -993,8 +994,8 @@ func mustProvisionWorkspace(t *testing.T, client *codersdk.Client, mut ...func(*
993994
t.Helper()
994995
user := coderdtest.CreateFirstUser(t, client)
995996
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
996-
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
997997
coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
998+
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
998999
ws := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID, mut...)
9991000
coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, ws.LatestBuild.ID)
10001001
return coderdtest.MustWorkspace(t, client, ws.ID)
@@ -1016,8 +1017,8 @@ func mustProvisionWorkspaceWithParameters(t *testing.T, client *codersdk.Client,
10161017
},
10171018
ProvisionApply: echo.ApplyComplete,
10181019
})
1019-
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
10201020
coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
1021+
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
10211022
ws := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID, mut...)
10221023
coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, ws.LatestBuild.ID)
10231024
return coderdtest.MustWorkspace(t, client, ws.ID)

0 commit comments

Comments
 (0)