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

Commit003f752

Browse files
committed
Migrate agent_test.go to use the new fakes
1 parentc4d9108 commit003f752

File tree

1 file changed

+25
-53
lines changed

1 file changed

+25
-53
lines changed

‎cli/agent_test.go

Lines changed: 25 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
"github.com/coder/coder/v2/coderd/database"
2020
"github.com/coder/coder/v2/coderd/database/dbfake"
2121
"github.com/coder/coder/v2/codersdk"
22-
"github.com/coder/coder/v2/provisioner/echo"
2322
"github.com/coder/coder/v2/provisionersdk/proto"
2423
"github.com/coder/coder/v2/pty/ptytest"
2524
)
@@ -30,20 +29,12 @@ func TestWorkspaceAgent(t *testing.T) {
3029
t.Run("LogDirectory",func(t*testing.T) {
3130
t.Parallel()
3231

33-
authToken:=uuid.NewString()
34-
client:=coderdtest.New(t,&coderdtest.Options{
35-
IncludeProvisionerDaemon:true,
36-
})
32+
client,db:=coderdtest.NewWithDatabase(t,nil)
3733
user:=coderdtest.CreateFirstUser(t,client)
38-
version:=coderdtest.CreateTemplateVersion(t,client,user.OrganizationID,&echo.Responses{
39-
Parse:echo.ParseComplete,
40-
ProvisionApply:echo.ProvisionApplyWithAgent(authToken),
34+
ws,authToken:=dbfake.CreateWorkspaceWithAgent(t,db, database.Workspace{
35+
OrganizationID:user.OrganizationID,
36+
OwnerID:user.UserID,
4137
})
42-
template:=coderdtest.CreateTemplate(t,client,user.OrganizationID,version.ID)
43-
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
44-
workspace:=coderdtest.CreateWorkspace(t,client,user.OrganizationID,template.ID)
45-
coderdtest.AwaitWorkspaceBuildJobCompleted(t,client,workspace.LatestBuild.ID)
46-
4738
logDir:=t.TempDir()
4839
inv,_:=clitest.New(t,
4940
"agent",
@@ -59,7 +50,7 @@ func TestWorkspaceAgent(t *testing.T) {
5950
ctx:=inv.Context()
6051
pty.ExpectMatchContext(ctx,"agent is starting now")
6152

62-
coderdtest.AwaitWorkspaceAgents(t,client,workspace.ID)
53+
coderdtest.AwaitWorkspaceAgents(t,client,ws.ID)
6354

6455
info,err:=os.Stat(filepath.Join(logDir,"coder-agent.log"))
6556
require.NoError(t,err)
@@ -154,35 +145,24 @@ func TestWorkspaceAgent(t *testing.T) {
154145
t.Parallel()
155146
instanceID:="instanceidentifier"
156147
validator,metadataClient:=coderdtest.NewGoogleInstanceIdentity(t,instanceID,false)
157-
client:=coderdtest.New(t,&coderdtest.Options{
158-
GoogleTokenValidator:validator,
159-
IncludeProvisionerDaemon:true,
148+
client,db:=coderdtest.NewWithDatabase(t,&coderdtest.Options{
149+
GoogleTokenValidator:validator,
160150
})
161151
owner:=coderdtest.CreateFirstUser(t,client)
162-
member,_:=coderdtest.CreateAnotherUser(t,client,owner.OrganizationID)
163-
version:=coderdtest.CreateTemplateVersion(t,client,owner.OrganizationID,&echo.Responses{
164-
Parse:echo.ParseComplete,
165-
ProvisionApply: []*proto.Response{{
166-
Type:&proto.Response_Apply{
167-
Apply:&proto.ApplyComplete{
168-
Resources: []*proto.Resource{{
169-
Name:"somename",
170-
Type:"someinstance",
171-
Agents: []*proto.Agent{{
172-
Auth:&proto.Agent_InstanceId{
173-
InstanceId:instanceID,
174-
},
175-
}},
176-
}},
177-
},
152+
member,memberUser:=coderdtest.CreateAnotherUser(t,client,owner.OrganizationID)
153+
ws:=dbfake.CreateWorkspace(t,db, database.Workspace{
154+
OrganizationID:owner.OrganizationID,
155+
OwnerID:memberUser.ID,
156+
})
157+
dbfake.CreateWorkspaceBuild(t,db,ws, database.WorkspaceBuild{},&proto.Resource{
158+
Name:"somename",
159+
Type:"someinstance",
160+
Agents: []*proto.Agent{{
161+
Auth:&proto.Agent_InstanceId{
162+
InstanceId:instanceID,
178163
},
179164
}},
180165
})
181-
template:=coderdtest.CreateTemplate(t,client,owner.OrganizationID,version.ID)
182-
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
183-
workspace:=coderdtest.CreateWorkspace(t,member,owner.OrganizationID,template.ID)
184-
coderdtest.AwaitWorkspaceBuildJobCompleted(t,client,workspace.LatestBuild.ID)
185-
186166
inv,cfg:=clitest.New(t,"agent","--auth","google-instance-identity","--agent-url",client.URL.String())
187167
ptytest.New(t).Attach(inv)
188168
clitest.SetupConfig(t,member,cfg)
@@ -194,9 +174,8 @@ func TestWorkspaceAgent(t *testing.T) {
194174
)
195175

196176
ctx:=inv.Context()
197-
198-
coderdtest.AwaitWorkspaceAgents(t,client,workspace.ID)
199-
workspace,err:=client.Workspace(ctx,workspace.ID)
177+
coderdtest.AwaitWorkspaceAgents(t,client,ws.ID)
178+
workspace,err:=client.Workspace(ctx,ws.ID)
200179
require.NoError(t,err)
201180
resources:=workspace.LatestBuild.Resources
202181
ifassert.NotEmpty(t,resources)&&assert.NotEmpty(t,resources[0].Agents) {
@@ -226,19 +205,12 @@ func TestWorkspaceAgent(t *testing.T) {
226205
t.Run("PostStartup",func(t*testing.T) {
227206
t.Parallel()
228207

229-
authToken:=uuid.NewString()
230-
client:=coderdtest.New(t,&coderdtest.Options{
231-
IncludeProvisionerDaemon:true,
232-
})
208+
client,db:=coderdtest.NewWithDatabase(t,nil)
233209
user:=coderdtest.CreateFirstUser(t,client)
234-
version:=coderdtest.CreateTemplateVersion(t,client,user.OrganizationID,&echo.Responses{
235-
Parse:echo.ParseComplete,
236-
ProvisionApply:echo.ProvisionApplyWithAgent(authToken),
210+
ws,authToken:=dbfake.CreateWorkspaceWithAgent(t,db, database.Workspace{
211+
OrganizationID:user.OrganizationID,
212+
OwnerID:user.UserID,
237213
})
238-
template:=coderdtest.CreateTemplate(t,client,user.OrganizationID,version.ID)
239-
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
240-
workspace:=coderdtest.CreateWorkspace(t,client,user.OrganizationID,template.ID)
241-
coderdtest.AwaitWorkspaceBuildJobCompleted(t,client,workspace.LatestBuild.ID)
242214

243215
logDir:=t.TempDir()
244216
inv,_:=clitest.New(t,
@@ -256,7 +228,7 @@ func TestWorkspaceAgent(t *testing.T) {
256228
clitest.Start(t,inv)
257229
pty.ExpectMatchContext(inv.Context(),"agent is starting now")
258230

259-
resources:=coderdtest.AwaitWorkspaceAgents(t,client,workspace.ID)
231+
resources:=coderdtest.AwaitWorkspaceAgents(t,client,ws.ID)
260232
require.Len(t,resources,1)
261233
require.Len(t,resources[0].Agents,1)
262234
require.Len(t,resources[0].Agents[0].Subsystems,2)

0 commit comments

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