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

Commitba7077a

Browse files
authored
Merge branch 'main' into cj/exp/mcp
2 parents0aa8903 +ac74c65 commitba7077a

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

‎cli/create_test.go

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -332,20 +332,21 @@ func TestCreateWithRichParameters(t *testing.T) {
332332
immutableParameterValue="4"
333333
)
334334

335-
echoResponses:=prepareEchoResponses([]*proto.RichParameter{
336-
{Name:firstParameterName,Description:firstParameterDescription,Mutable:true},
337-
{Name:secondParameterName,DisplayName:secondParameterDisplayName,Description:secondParameterDescription,Mutable:true},
338-
{Name:immutableParameterName,Description:immutableParameterDescription,Mutable:false},
339-
},
340-
)
335+
echoResponses:=func()*echo.Responses {
336+
returnprepareEchoResponses([]*proto.RichParameter{
337+
{Name:firstParameterName,Description:firstParameterDescription,Mutable:true},
338+
{Name:secondParameterName,DisplayName:secondParameterDisplayName,Description:secondParameterDescription,Mutable:true},
339+
{Name:immutableParameterName,Description:immutableParameterDescription,Mutable:false},
340+
})
341+
}
341342

342343
t.Run("InputParameters",func(t*testing.T) {
343344
t.Parallel()
344345

345346
client:=coderdtest.New(t,&coderdtest.Options{IncludeProvisionerDaemon:true})
346347
owner:=coderdtest.CreateFirstUser(t,client)
347348
member,_:=coderdtest.CreateAnotherUser(t,client,owner.OrganizationID)
348-
version:=coderdtest.CreateTemplateVersion(t,client,owner.OrganizationID,echoResponses)
349+
version:=coderdtest.CreateTemplateVersion(t,client,owner.OrganizationID,echoResponses())
349350
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
350351

351352
template:=coderdtest.CreateTemplate(t,client,owner.OrganizationID,version.ID)
@@ -385,7 +386,7 @@ func TestCreateWithRichParameters(t *testing.T) {
385386
client:=coderdtest.New(t,&coderdtest.Options{IncludeProvisionerDaemon:true})
386387
owner:=coderdtest.CreateFirstUser(t,client)
387388
member,_:=coderdtest.CreateAnotherUser(t,client,owner.OrganizationID)
388-
version:=coderdtest.CreateTemplateVersion(t,client,owner.OrganizationID,echoResponses)
389+
version:=coderdtest.CreateTemplateVersion(t,client,owner.OrganizationID,echoResponses())
389390
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
390391

391392
template:=coderdtest.CreateTemplate(t,client,owner.OrganizationID,version.ID)
@@ -447,7 +448,7 @@ func TestCreateWithRichParameters(t *testing.T) {
447448
client:=coderdtest.New(t,&coderdtest.Options{IncludeProvisionerDaemon:true})
448449
owner:=coderdtest.CreateFirstUser(t,client)
449450
member,_:=coderdtest.CreateAnotherUser(t,client,owner.OrganizationID)
450-
version:=coderdtest.CreateTemplateVersion(t,client,owner.OrganizationID,echoResponses)
451+
version:=coderdtest.CreateTemplateVersion(t,client,owner.OrganizationID,echoResponses())
451452
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
452453

453454
template:=coderdtest.CreateTemplate(t,client,owner.OrganizationID,version.ID)
@@ -488,7 +489,7 @@ func TestCreateWithRichParameters(t *testing.T) {
488489
client:=coderdtest.New(t,&coderdtest.Options{IncludeProvisionerDaemon:true})
489490
owner:=coderdtest.CreateFirstUser(t,client)
490491
member,_:=coderdtest.CreateAnotherUser(t,client,owner.OrganizationID)
491-
version:=coderdtest.CreateTemplateVersion(t,client,owner.OrganizationID,echoResponses)
492+
version:=coderdtest.CreateTemplateVersion(t,client,owner.OrganizationID,echoResponses())
492493
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
493494

494495
template:=coderdtest.CreateTemplate(t,client,owner.OrganizationID,version.ID)
@@ -524,7 +525,7 @@ func TestCreateWithRichParameters(t *testing.T) {
524525
client:=coderdtest.New(t,&coderdtest.Options{IncludeProvisionerDaemon:true})
525526
owner:=coderdtest.CreateFirstUser(t,client)
526527
member,_:=coderdtest.CreateAnotherUser(t,client,owner.OrganizationID)
527-
version:=coderdtest.CreateTemplateVersion(t,client,owner.OrganizationID,echoResponses)
528+
version:=coderdtest.CreateTemplateVersion(t,client,owner.OrganizationID,echoResponses())
528529
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
529530

530531
template:=coderdtest.CreateTemplate(t,client,owner.OrganizationID,version.ID)
@@ -549,7 +550,7 @@ func TestCreateWithRichParameters(t *testing.T) {
549550
client:=coderdtest.New(t,&coderdtest.Options{IncludeProvisionerDaemon:true})
550551
owner:=coderdtest.CreateFirstUser(t,client)
551552
member,_:=coderdtest.CreateAnotherUser(t,client,owner.OrganizationID)
552-
version:=coderdtest.CreateTemplateVersion(t,client,owner.OrganizationID,echoResponses)
553+
version:=coderdtest.CreateTemplateVersion(t,client,owner.OrganizationID,echoResponses())
553554
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
554555

555556
template:=coderdtest.CreateTemplate(t,client,owner.OrganizationID,version.ID)
@@ -603,7 +604,7 @@ func TestCreateWithRichParameters(t *testing.T) {
603604
client:=coderdtest.New(t,&coderdtest.Options{IncludeProvisionerDaemon:true})
604605
owner:=coderdtest.CreateFirstUser(t,client)
605606
member,_:=coderdtest.CreateAnotherUser(t,client,owner.OrganizationID)
606-
version:=coderdtest.CreateTemplateVersion(t,client,owner.OrganizationID,echoResponses)
607+
version:=coderdtest.CreateTemplateVersion(t,client,owner.OrganizationID,echoResponses())
607608
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
608609

609610
template:=coderdtest.CreateTemplate(t,client,owner.OrganizationID,version.ID)

‎cli/ssh_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1986,7 +1986,7 @@ func TestSSH_Container(t *testing.T) {
19861986
t.Run("NotFound",func(t*testing.T) {
19871987
t.Parallel()
19881988

1989-
ctx:=testutil.Context(t,testutil.WaitShort)
1989+
ctx:=testutil.Context(t,testutil.WaitLong)
19901990
client,workspace,agentToken:=setupWorkspaceForAgent(t)
19911991
ctrl:=gomock.NewController(t)
19921992
mLister:=acmock.NewMockLister(ctrl)
@@ -2024,7 +2024,7 @@ func TestSSH_Container(t *testing.T) {
20242024
t.Run("NotEnabled",func(t*testing.T) {
20252025
t.Parallel()
20262026

2027-
ctx:=testutil.Context(t,testutil.WaitShort)
2027+
ctx:=testutil.Context(t,testutil.WaitLong)
20282028
client,workspace,agentToken:=setupWorkspaceForAgent(t)
20292029
_=agenttest.New(t,client.URL,agentToken)
20302030
_=coderdtest.NewWorkspaceAgentWaiter(t,client,workspace.ID).Wait()

0 commit comments

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