Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite8b84eb

Browse files
committed
for real tho
1 parent2448ab3 commite8b84eb

File tree

58 files changed

+524
-524
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+524
-524
lines changed

‎cli/agent_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ func TestWorkspaceAgent(t *testing.T) {
3838
ProvisionApply:echo.ProvisionApplyWithAgent(authToken),
3939
})
4040
template:=coderdtest.CreateTemplate(t,client,user.OrganizationID,version.ID)
41-
coderdtest.AwaitTemplateVersionJob(t,client,version.ID)
41+
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
4242
workspace:=coderdtest.CreateWorkspace(t,client,user.OrganizationID,template.ID)
43-
coderdtest.AwaitWorkspaceBuildJob(t,client,workspace.LatestBuild.ID)
43+
coderdtest.AwaitWorkspaceBuildJobCompleted(t,client,workspace.LatestBuild.ID)
4444

4545
logDir:=t.TempDir()
4646
inv,_:=clitest.New(t,
@@ -92,9 +92,9 @@ func TestWorkspaceAgent(t *testing.T) {
9292
}},
9393
})
9494
template:=coderdtest.CreateTemplate(t,client,user.OrganizationID,version.ID)
95-
coderdtest.AwaitTemplateVersionJob(t,client,version.ID)
95+
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
9696
workspace:=coderdtest.CreateWorkspace(t,client,user.OrganizationID,template.ID)
97-
coderdtest.AwaitWorkspaceBuildJob(t,client,workspace.LatestBuild.ID)
97+
coderdtest.AwaitWorkspaceBuildJobCompleted(t,client,workspace.LatestBuild.ID)
9898

9999
inv,_:=clitest.New(t,"agent","--auth","azure-instance-identity","--agent-url",client.URL.String())
100100
inv=inv.WithContext(
@@ -144,9 +144,9 @@ func TestWorkspaceAgent(t *testing.T) {
144144
}},
145145
})
146146
template:=coderdtest.CreateTemplate(t,client,user.OrganizationID,version.ID)
147-
coderdtest.AwaitTemplateVersionJob(t,client,version.ID)
147+
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
148148
workspace:=coderdtest.CreateWorkspace(t,client,user.OrganizationID,template.ID)
149-
coderdtest.AwaitWorkspaceBuildJob(t,client,workspace.LatestBuild.ID)
149+
coderdtest.AwaitWorkspaceBuildJobCompleted(t,client,workspace.LatestBuild.ID)
150150

151151
inv,_:=clitest.New(t,"agent","--auth","aws-instance-identity","--agent-url",client.URL.String())
152152
inv=inv.WithContext(
@@ -196,9 +196,9 @@ func TestWorkspaceAgent(t *testing.T) {
196196
}},
197197
})
198198
template:=coderdtest.CreateTemplate(t,client,user.OrganizationID,version.ID)
199-
coderdtest.AwaitTemplateVersionJob(t,client,version.ID)
199+
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
200200
workspace:=coderdtest.CreateWorkspace(t,client,user.OrganizationID,template.ID)
201-
coderdtest.AwaitWorkspaceBuildJob(t,client,workspace.LatestBuild.ID)
201+
coderdtest.AwaitWorkspaceBuildJobCompleted(t,client,workspace.LatestBuild.ID)
202202

203203
inv,cfg:=clitest.New(t,"agent","--auth","google-instance-identity","--agent-url",client.URL.String())
204204
ptytest.New(t).Attach(inv)
@@ -253,9 +253,9 @@ func TestWorkspaceAgent(t *testing.T) {
253253
ProvisionApply:echo.ProvisionApplyWithAgent(authToken),
254254
})
255255
template:=coderdtest.CreateTemplate(t,client,user.OrganizationID,version.ID)
256-
coderdtest.AwaitTemplateVersionJob(t,client,version.ID)
256+
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
257257
workspace:=coderdtest.CreateWorkspace(t,client,user.OrganizationID,template.ID)
258-
coderdtest.AwaitWorkspaceBuildJob(t,client,workspace.LatestBuild.ID)
258+
coderdtest.AwaitWorkspaceBuildJobCompleted(t,client,workspace.LatestBuild.ID)
259259

260260
logDir:=t.TempDir()
261261
inv,_:=clitest.New(t,

‎cli/clitest/golden.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,14 +182,14 @@ func prepareTestData(t *testing.T) (*codersdk.Client, map[string]string) {
182182
})
183183
require.NoError(t,err)
184184
version:=coderdtest.CreateTemplateVersion(t,rootClient,firstUser.OrganizationID,nil)
185-
version=coderdtest.AwaitTemplateVersionJob(t,rootClient,version.ID)
185+
version=coderdtest.AwaitTemplateVersionJobCompleted(t,rootClient,version.ID)
186186
template:=coderdtest.CreateTemplate(t,rootClient,firstUser.OrganizationID,version.ID,func(req*codersdk.CreateTemplateRequest) {
187187
req.Name="test-template"
188188
})
189189
workspace:=coderdtest.CreateWorkspace(t,rootClient,firstUser.OrganizationID,template.ID,func(req*codersdk.CreateWorkspaceRequest) {
190190
req.Name="test-workspace"
191191
})
192-
workspaceBuild:=coderdtest.AwaitWorkspaceBuildJob(t,rootClient,workspace.LatestBuild.ID)
192+
workspaceBuild:=coderdtest.AwaitWorkspaceBuildJobCompleted(t,rootClient,workspace.LatestBuild.ID)
193193

194194
replacements:=map[string]string{
195195
firstUser.UserID.String():"[first user ID]",

‎cli/configssh_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ func TestConfigSSH(t *testing.T) {
9595
}},
9696
ProvisionApply:echo.ProvisionApplyWithAgent(authToken),
9797
})
98-
coderdtest.AwaitTemplateVersionJob(t,client,version.ID)
98+
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
9999
template:=coderdtest.CreateTemplate(t,client,user.OrganizationID,version.ID)
100100
workspace:=coderdtest.CreateWorkspace(t,client,user.OrganizationID,template.ID)
101-
coderdtest.AwaitWorkspaceBuildJob(t,client,workspace.LatestBuild.ID)
101+
coderdtest.AwaitWorkspaceBuildJobCompleted(t,client,workspace.LatestBuild.ID)
102102
_=agenttest.New(t,client.URL,authToken)
103103
resources:=coderdtest.AwaitWorkspaceAgents(t,client,workspace.ID)
104104
agentConn,err:=client.DialWorkspaceAgent(context.Background(),resources[0].Agents[0].ID,nil)
@@ -594,10 +594,10 @@ func TestConfigSSH_FileWriteAndOptionsFlow(t *testing.T) {
594594
client=coderdtest.New(t,&coderdtest.Options{IncludeProvisionerDaemon:true})
595595
user=coderdtest.CreateFirstUser(t,client)
596596
version=coderdtest.CreateTemplateVersion(t,client,user.OrganizationID,tt.echoResponse)
597-
_=coderdtest.AwaitTemplateVersionJob(t,client,version.ID)
597+
_=coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
598598
project=coderdtest.CreateTemplate(t,client,user.OrganizationID,version.ID)
599599
workspace=coderdtest.CreateWorkspace(t,client,user.OrganizationID,project.ID)
600-
_=coderdtest.AwaitWorkspaceBuildJob(t,client,workspace.LatestBuild.ID)
600+
_=coderdtest.AwaitWorkspaceBuildJobCompleted(t,client,workspace.LatestBuild.ID)
601601
)
602602

603603
// Prepare ssh config files.
@@ -714,10 +714,10 @@ func TestConfigSSH_Hostnames(t *testing.T) {
714714
// authToken := uuid.NewString()
715715
version:=coderdtest.CreateTemplateVersion(t,client,user.OrganizationID,
716716
echo.WithResources(resources))
717-
coderdtest.AwaitTemplateVersionJob(t,client,version.ID)
717+
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
718718
template:=coderdtest.CreateTemplate(t,client,user.OrganizationID,version.ID)
719719
workspace:=coderdtest.CreateWorkspace(t,client,user.OrganizationID,template.ID)
720-
coderdtest.AwaitWorkspaceBuildJob(t,client,workspace.LatestBuild.ID)
720+
coderdtest.AwaitWorkspaceBuildJobCompleted(t,client,workspace.LatestBuild.ID)
721721

722722
sshConfigFile:=sshConfigFileName(t)
723723

‎cli/create_test.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func TestCreate(t *testing.T) {
3030
client:=coderdtest.New(t,&coderdtest.Options{IncludeProvisionerDaemon:true})
3131
user:=coderdtest.CreateFirstUser(t,client)
3232
version:=coderdtest.CreateTemplateVersion(t,client,user.OrganizationID,completeWithAgent())
33-
coderdtest.AwaitTemplateVersionJob(t,client,version.ID)
33+
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
3434
template:=coderdtest.CreateTemplate(t,client,user.OrganizationID,version.ID)
3535
args:= []string{
3636
"create",
@@ -81,7 +81,7 @@ func TestCreate(t *testing.T) {
8181
client:=coderdtest.New(t,&coderdtest.Options{IncludeProvisionerDaemon:true})
8282
owner:=coderdtest.CreateFirstUser(t,client)
8383
version:=coderdtest.CreateTemplateVersion(t,client,owner.OrganizationID,completeWithAgent())
84-
coderdtest.AwaitTemplateVersionJob(t,client,version.ID)
84+
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
8585
template:=coderdtest.CreateTemplate(t,client,owner.OrganizationID,version.ID)
8686
_,user:=coderdtest.CreateAnotherUser(t,client,owner.OrganizationID)
8787
args:= []string{
@@ -134,7 +134,7 @@ func TestCreate(t *testing.T) {
134134
client:=coderdtest.New(t,&coderdtest.Options{IncludeProvisionerDaemon:true})
135135
user:=coderdtest.CreateFirstUser(t,client)
136136
version:=coderdtest.CreateTemplateVersion(t,client,user.OrganizationID,completeWithAgent())
137-
coderdtest.AwaitTemplateVersionJob(t,client,version.ID)
137+
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
138138
template:=coderdtest.CreateTemplate(t,client,user.OrganizationID,version.ID,func(ctr*codersdk.CreateTemplateRequest) {
139139
vardefaultTTLMillisint64=2*60*60*1000// 2 hours
140140
ctr.DefaultTTLMillis=&defaultTTLMillis
@@ -175,7 +175,7 @@ func TestCreate(t *testing.T) {
175175
client:=coderdtest.New(t,&coderdtest.Options{IncludeProvisionerDaemon:true})
176176
user:=coderdtest.CreateFirstUser(t,client)
177177
version:=coderdtest.CreateTemplateVersion(t,client,user.OrganizationID,nil)
178-
coderdtest.AwaitTemplateVersionJob(t,client,version.ID)
178+
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
179179
_=coderdtest.CreateTemplate(t,client,user.OrganizationID,version.ID)
180180
inv,root:=clitest.New(t,"create","my-workspace","-y")
181181

@@ -197,7 +197,7 @@ func TestCreate(t *testing.T) {
197197
client:=coderdtest.New(t,&coderdtest.Options{IncludeProvisionerDaemon:true})
198198
user:=coderdtest.CreateFirstUser(t,client)
199199
version:=coderdtest.CreateTemplateVersion(t,client,user.OrganizationID,nil)
200-
coderdtest.AwaitTemplateVersionJob(t,client,version.ID)
200+
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
201201
template:=coderdtest.CreateTemplate(t,client,user.OrganizationID,version.ID)
202202
inv,root:=clitest.New(t,"create","")
203203
clitest.SetupConfig(t,client,root)
@@ -275,7 +275,7 @@ func TestCreateWithRichParameters(t *testing.T) {
275275
client:=coderdtest.New(t,&coderdtest.Options{IncludeProvisionerDaemon:true})
276276
user:=coderdtest.CreateFirstUser(t,client)
277277
version:=coderdtest.CreateTemplateVersion(t,client,user.OrganizationID,echoResponses)
278-
coderdtest.AwaitTemplateVersionJob(t,client,version.ID)
278+
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
279279

280280
template:=coderdtest.CreateTemplate(t,client,user.OrganizationID,version.ID)
281281

@@ -314,7 +314,7 @@ func TestCreateWithRichParameters(t *testing.T) {
314314
client:=coderdtest.New(t,&coderdtest.Options{IncludeProvisionerDaemon:true})
315315
user:=coderdtest.CreateFirstUser(t,client)
316316
version:=coderdtest.CreateTemplateVersion(t,client,user.OrganizationID,echoResponses)
317-
coderdtest.AwaitTemplateVersionJob(t,client,version.ID)
317+
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
318318

319319
template:=coderdtest.CreateTemplate(t,client,user.OrganizationID,version.ID)
320320

@@ -354,7 +354,7 @@ func TestCreateWithRichParameters(t *testing.T) {
354354
client:=coderdtest.New(t,&coderdtest.Options{IncludeProvisionerDaemon:true})
355355
user:=coderdtest.CreateFirstUser(t,client)
356356
version:=coderdtest.CreateTemplateVersion(t,client,user.OrganizationID,echoResponses)
357-
coderdtest.AwaitTemplateVersionJob(t,client,version.ID)
357+
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
358358

359359
template:=coderdtest.CreateTemplate(t,client,user.OrganizationID,version.ID)
360360

@@ -422,7 +422,7 @@ func TestCreateValidateRichParameters(t *testing.T) {
422422
client:=coderdtest.New(t,&coderdtest.Options{IncludeProvisionerDaemon:true})
423423
user:=coderdtest.CreateFirstUser(t,client)
424424
version:=coderdtest.CreateTemplateVersion(t,client,user.OrganizationID,prepareEchoResponses(stringRichParameters))
425-
coderdtest.AwaitTemplateVersionJob(t,client,version.ID)
425+
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
426426

427427
template:=coderdtest.CreateTemplate(t,client,user.OrganizationID,version.ID)
428428

@@ -459,7 +459,7 @@ func TestCreateValidateRichParameters(t *testing.T) {
459459
client:=coderdtest.New(t,&coderdtest.Options{IncludeProvisionerDaemon:true})
460460
user:=coderdtest.CreateFirstUser(t,client)
461461
version:=coderdtest.CreateTemplateVersion(t,client,user.OrganizationID,prepareEchoResponses(numberRichParameters))
462-
coderdtest.AwaitTemplateVersionJob(t,client,version.ID)
462+
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
463463

464464
template:=coderdtest.CreateTemplate(t,client,user.OrganizationID,version.ID)
465465

@@ -496,7 +496,7 @@ func TestCreateValidateRichParameters(t *testing.T) {
496496
client:=coderdtest.New(t,&coderdtest.Options{IncludeProvisionerDaemon:true})
497497
user:=coderdtest.CreateFirstUser(t,client)
498498
version:=coderdtest.CreateTemplateVersion(t,client,user.OrganizationID,prepareEchoResponses(boolRichParameters))
499-
coderdtest.AwaitTemplateVersionJob(t,client,version.ID)
499+
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
500500

501501
template:=coderdtest.CreateTemplate(t,client,user.OrganizationID,version.ID)
502502

@@ -533,7 +533,7 @@ func TestCreateValidateRichParameters(t *testing.T) {
533533
client:=coderdtest.New(t,&coderdtest.Options{IncludeProvisionerDaemon:true})
534534
user:=coderdtest.CreateFirstUser(t,client)
535535
version:=coderdtest.CreateTemplateVersion(t,client,user.OrganizationID,prepareEchoResponses(listOfStringsRichParameters))
536-
coderdtest.AwaitTemplateVersionJob(t,client,version.ID)
536+
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
537537
template:=coderdtest.CreateTemplate(t,client,user.OrganizationID,version.ID)
538538

539539
inv,root:=clitest.New(t,"create","my-workspace","--template",template.Name)
@@ -562,7 +562,7 @@ func TestCreateValidateRichParameters(t *testing.T) {
562562
client:=coderdtest.New(t,&coderdtest.Options{IncludeProvisionerDaemon:true})
563563
user:=coderdtest.CreateFirstUser(t,client)
564564
version:=coderdtest.CreateTemplateVersion(t,client,user.OrganizationID,prepareEchoResponses(listOfStringsRichParameters))
565-
coderdtest.AwaitTemplateVersionJob(t,client,version.ID)
565+
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
566566
template:=coderdtest.CreateTemplate(t,client,user.OrganizationID,version.ID)
567567

568568
tempDir:=t.TempDir()
@@ -619,7 +619,7 @@ func TestCreateWithGitAuth(t *testing.T) {
619619
})
620620
user:=coderdtest.CreateFirstUser(t,client)
621621
version:=coderdtest.CreateTemplateVersion(t,client,user.OrganizationID,echoResponses)
622-
coderdtest.AwaitTemplateVersionJob(t,client,version.ID)
622+
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
623623
template:=coderdtest.CreateTemplate(t,client,user.OrganizationID,version.ID)
624624

625625
inv,root:=clitest.New(t,"create","my-workspace","--template",template.Name)

‎cli/delete_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ func TestDelete(t *testing.T) {
2525
client:=coderdtest.New(t,&coderdtest.Options{IncludeProvisionerDaemon:true})
2626
user:=coderdtest.CreateFirstUser(t,client)
2727
version:=coderdtest.CreateTemplateVersion(t,client,user.OrganizationID,nil)
28-
coderdtest.AwaitTemplateVersionJob(t,client,version.ID)
28+
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
2929
template:=coderdtest.CreateTemplate(t,client,user.OrganizationID,version.ID)
3030
workspace:=coderdtest.CreateWorkspace(t,client,user.OrganizationID,template.ID)
31-
coderdtest.AwaitWorkspaceBuildJob(t,client,workspace.LatestBuild.ID)
31+
coderdtest.AwaitWorkspaceBuildJobCompleted(t,client,workspace.LatestBuild.ID)
3232
inv,root:=clitest.New(t,"delete",workspace.Name,"-y")
3333
clitest.SetupConfig(t,client,root)
3434
doneChan:=make(chanstruct{})
@@ -50,10 +50,10 @@ func TestDelete(t *testing.T) {
5050
client:=coderdtest.New(t,&coderdtest.Options{IncludeProvisionerDaemon:true})
5151
user:=coderdtest.CreateFirstUser(t,client)
5252
version:=coderdtest.CreateTemplateVersion(t,client,user.OrganizationID,nil)
53-
coderdtest.AwaitTemplateVersionJob(t,client,version.ID)
53+
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
5454
template:=coderdtest.CreateTemplate(t,client,user.OrganizationID,version.ID)
5555
workspace:=coderdtest.CreateWorkspace(t,client,user.OrganizationID,template.ID)
56-
coderdtest.AwaitWorkspaceBuildJob(t,client,workspace.LatestBuild.ID)
56+
coderdtest.AwaitWorkspaceBuildJobCompleted(t,client,workspace.LatestBuild.ID)
5757
inv,root:=clitest.New(t,"delete",workspace.Name,"-y","--orphan")
5858

5959
clitest.SetupConfig(t,client,root)
@@ -83,11 +83,11 @@ func TestDelete(t *testing.T) {
8383
user:=coderdtest.CreateFirstUser(t,client)
8484
deleteMeClient,deleteMeUser:=coderdtest.CreateAnotherUser(t,client,user.OrganizationID)
8585
version:=coderdtest.CreateTemplateVersion(t,client,user.OrganizationID,nil)
86-
coderdtest.AwaitTemplateVersionJob(t,client,version.ID)
86+
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
8787
template:=coderdtest.CreateTemplate(t,client,user.OrganizationID,version.ID)
8888

8989
workspace:=coderdtest.CreateWorkspace(t,deleteMeClient,user.OrganizationID,template.ID)
90-
coderdtest.AwaitWorkspaceBuildJob(t,deleteMeClient,workspace.LatestBuild.ID)
90+
coderdtest.AwaitWorkspaceBuildJobCompleted(t,deleteMeClient,workspace.LatestBuild.ID)
9191

9292
// The API checks if the user has any workspaces, so we cannot delete a user
9393
// this way.
@@ -127,10 +127,10 @@ func TestDelete(t *testing.T) {
127127
require.NoError(t,err)
128128

129129
version:=coderdtest.CreateTemplateVersion(t,adminClient,orgID,nil)
130-
coderdtest.AwaitTemplateVersionJob(t,adminClient,version.ID)
130+
coderdtest.AwaitTemplateVersionJobCompleted(t,adminClient,version.ID)
131131
template:=coderdtest.CreateTemplate(t,adminClient,orgID,version.ID)
132132
workspace:=coderdtest.CreateWorkspace(t,client,orgID,template.ID)
133-
coderdtest.AwaitWorkspaceBuildJob(t,client,workspace.LatestBuild.ID)
133+
coderdtest.AwaitWorkspaceBuildJobCompleted(t,client,workspace.LatestBuild.ID)
134134

135135
inv,root:=clitest.New(t,"delete",user.Username+"/"+workspace.Name,"-y")
136136
clitest.SetupConfig(t,adminClient,root)

‎cli/gitssh_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ func prepareTestGitSSH(ctx context.Context, t *testing.T) (*agentsdk.Client, str
5555
ProvisionApply:echo.ProvisionApplyWithAgent(agentToken),
5656
})
5757
template:=coderdtest.CreateTemplate(t,client,user.OrganizationID,version.ID)
58-
coderdtest.AwaitTemplateVersionJob(t,client,version.ID)
58+
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
5959
workspace:=coderdtest.CreateWorkspace(t,client,user.OrganizationID,template.ID)
60-
coderdtest.AwaitWorkspaceBuildJob(t,client,workspace.LatestBuild.ID)
60+
coderdtest.AwaitWorkspaceBuildJobCompleted(t,client,workspace.LatestBuild.ID)
6161

6262
// start workspace agent
6363
agentClient:=agentsdk.New(client.URL)

‎cli/list_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ func TestList(t *testing.T) {
2323
client:=coderdtest.New(t,&coderdtest.Options{IncludeProvisionerDaemon:true})
2424
user:=coderdtest.CreateFirstUser(t,client)
2525
version:=coderdtest.CreateTemplateVersion(t,client,user.OrganizationID,nil)
26-
coderdtest.AwaitTemplateVersionJob(t,client,version.ID)
26+
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
2727
template:=coderdtest.CreateTemplate(t,client,user.OrganizationID,version.ID)
2828
workspace:=coderdtest.CreateWorkspace(t,client,user.OrganizationID,template.ID)
29-
coderdtest.AwaitWorkspaceBuildJob(t,client,workspace.LatestBuild.ID)
29+
coderdtest.AwaitWorkspaceBuildJobCompleted(t,client,workspace.LatestBuild.ID)
3030
inv,root:=clitest.New(t,"ls")
3131
clitest.SetupConfig(t,client,root)
3232
pty:=ptytest.New(t).Attach(inv)
@@ -50,10 +50,10 @@ func TestList(t *testing.T) {
5050
client:=coderdtest.New(t,&coderdtest.Options{IncludeProvisionerDaemon:true})
5151
user:=coderdtest.CreateFirstUser(t,client)
5252
version:=coderdtest.CreateTemplateVersion(t,client,user.OrganizationID,nil)
53-
coderdtest.AwaitTemplateVersionJob(t,client,version.ID)
53+
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
5454
template:=coderdtest.CreateTemplate(t,client,user.OrganizationID,version.ID)
5555
workspace:=coderdtest.CreateWorkspace(t,client,user.OrganizationID,template.ID)
56-
coderdtest.AwaitWorkspaceBuildJob(t,client,workspace.LatestBuild.ID)
56+
coderdtest.AwaitWorkspaceBuildJobCompleted(t,client,workspace.LatestBuild.ID)
5757

5858
inv,root:=clitest.New(t,"list","--output=json")
5959
clitest.SetupConfig(t,client,root)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp