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

Commita8e4495

Browse files
committed
fix coderd test
1 parent7a3c8a3 commita8e4495

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

‎coderd/workspaceagents_test.go

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1397,14 +1397,15 @@ func TestWorkspaceAgentRecreateDevcontainer(t *testing.T) {
13971397
agentcontainers.DevcontainerConfigFileLabel:configFile,
13981398
}
13991399
devContainer= codersdk.WorkspaceAgentContainer{
1400-
ID:uuid.NewString(),
1401-
CreatedAt:dbtime.Now(),
1402-
FriendlyName:testutil.GetRandomName(t),
1403-
Image:"busybox:latest",
1404-
Labels:dcLabels,
1405-
Running:true,
1406-
Status:"running",
1407-
DevcontainerDirty:true,
1400+
ID:uuid.NewString(),
1401+
CreatedAt:dbtime.Now(),
1402+
FriendlyName:testutil.GetRandomName(t),
1403+
Image:"busybox:latest",
1404+
Labels:dcLabels,
1405+
Running:true,
1406+
Status:"running",
1407+
DevcontainerDirty:true,
1408+
DevcontainerStatus:codersdk.WorkspaceAgentDevcontainerStatusRunning,
14081409
}
14091410
plainContainer= codersdk.WorkspaceAgentContainer{
14101411
ID:uuid.NewString(),
@@ -1419,14 +1420,15 @@ func TestWorkspaceAgentRecreateDevcontainer(t *testing.T) {
14191420

14201421
for_,tc:=range []struct {
14211422
namestring
1422-
setupMockfunc(*acmock.MockContainerCLI,*acmock.MockDevcontainerCLI) (statusint)
1423+
setupMockfunc(mcl*acmock.MockContainerCLI,mdccli*acmock.MockDevcontainerCLI) (statusint)
14231424
}{
14241425
{
14251426
name:"Recreate",
14261427
setupMock:func(mcl*acmock.MockContainerCLI,mdccli*acmock.MockDevcontainerCLI)int {
14271428
mcl.EXPECT().List(gomock.Any()).Return(codersdk.WorkspaceAgentListContainersResponse{
14281429
Containers: []codersdk.WorkspaceAgentContainer{devContainer},
14291430
},nil).AnyTimes()
1431+
mcl.EXPECT().DetectArchitecture(gomock.Any(),devContainer.ID).Return("<none>",nil).AnyTimes()// Prevent agent injection via incompatible architecture.
14301432
mdccli.EXPECT().Up(gomock.Any(),workspaceFolder,configFile,gomock.Any()).Return("someid",nil).Times(1)
14311433
return0
14321434
},
@@ -1452,9 +1454,9 @@ func TestWorkspaceAgentRecreateDevcontainer(t *testing.T) {
14521454
t.Parallel()
14531455

14541456
ctrl:=gomock.NewController(t)
1455-
mcl:=acmock.NewMockContainerCLI(ctrl)
1457+
mccli:=acmock.NewMockContainerCLI(ctrl)
14561458
mdccli:=acmock.NewMockDevcontainerCLI(ctrl)
1457-
wantStatus:=tc.setupMock(mcl,mdccli)
1459+
wantStatus:=tc.setupMock(mccli,mdccli)
14581460
logger:=slogtest.Make(t,&slogtest.Options{IgnoreErrors:true}).Leveled(slog.LevelDebug)
14591461
client,db:=coderdtest.NewWithDatabase(t,&coderdtest.Options{
14601462
Logger:&logger,
@@ -1471,7 +1473,7 @@ func TestWorkspaceAgentRecreateDevcontainer(t *testing.T) {
14711473
o.ExperimentalDevcontainersEnabled=true
14721474
o.ContainerAPIOptions=append(
14731475
o.ContainerAPIOptions,
1474-
agentcontainers.WithContainerCLI(mcl),
1476+
agentcontainers.WithContainerCLI(mccli),
14751477
agentcontainers.WithDevcontainerCLI(mdccli),
14761478
agentcontainers.WithWatcher(watcher.NewNoop()),
14771479
)

0 commit comments

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