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

Commit0422e41

Browse files
committed
Try to fix tests
1 parent7e0fefd commit0422e41

File tree

3 files changed

+20
-27
lines changed

3 files changed

+20
-27
lines changed

‎coderd/database/dbfake/dbfake.go

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
"github.com/coder/coder/v2/coderd/database/dbtime"
1616
"github.com/coder/coder/v2/coderd/provisionerdserver"
1717
"github.com/coder/coder/v2/coderd/telemetry"
18-
"github.com/coder/coder/v2/provisionersdk/proto"
1918
sdkproto"github.com/coder/coder/v2/provisionersdk/proto"
2019
)
2120

@@ -43,12 +42,12 @@ func WorkspaceWithAgent(t testing.TB, db database.Store, seed database.Workspace
4342
t.Helper()
4443
authToken:=uuid.NewString()
4544
ws:=Workspace(t,db,seed)
46-
WorkspaceBuild(t,db,ws, database.WorkspaceBuild{},&proto.Resource{
45+
WorkspaceBuild(t,db,ws, database.WorkspaceBuild{},&sdkproto.Resource{
4746
Name:"example",
4847
Type:"aws_instance",
49-
Agents: []*proto.Agent{{
48+
Agents: []*sdkproto.Agent{{
5049
Id:uuid.NewString(),
51-
Auth:&proto.Agent_Token{
50+
Auth:&sdkproto.Agent_Token{
5251
Token:authToken,
5352
},
5453
}},
@@ -60,8 +59,25 @@ func WorkspaceWithAgent(t testing.TB, db database.Store, seed database.Workspace
6059
funcWorkspaceBuild(t testing.TB,db database.Store,ws database.Workspace,seed database.WorkspaceBuild,resources...*sdkproto.Resource) database.WorkspaceBuild {
6160
t.Helper()
6261
jobID:=uuid.New()
62+
seed.ID=uuid.New()
6363
seed.JobID=jobID
6464
seed.WorkspaceID=ws.ID
65+
66+
// Create a provisioner job for the build!
67+
payload,err:=json.Marshal(provisionerdserver.WorkspaceProvisionJob{
68+
WorkspaceBuildID:seed.ID,
69+
})
70+
require.NoError(t,err)
71+
job:=dbgen.ProvisionerJob(t,db,nil, database.ProvisionerJob{
72+
ID:jobID,
73+
Input:payload,
74+
OrganizationID:ws.OrganizationID,
75+
CompletedAt: sql.NullTime{
76+
Time:dbtime.Now(),
77+
Valid:true,
78+
},
79+
})
80+
6581
// This intentionally fulfills the minimum requirements of the schema.
6682
// Tests can provide a custom version ID if necessary.
6783
ifseed.TemplateVersionID==uuid.Nil {
@@ -91,20 +107,6 @@ func WorkspaceBuild(t testing.TB, db database.Store, ws database.Workspace, seed
91107
seed.TemplateVersionID=templateVersion.ID
92108
}
93109
build:=dbgen.WorkspaceBuild(t,db,seed)
94-
95-
payload,err:=json.Marshal(provisionerdserver.WorkspaceProvisionJob{
96-
WorkspaceBuildID:build.ID,
97-
})
98-
require.NoError(t,err)
99-
job:=dbgen.ProvisionerJob(t,db,nil, database.ProvisionerJob{
100-
ID:jobID,
101-
Input:payload,
102-
OrganizationID:ws.OrganizationID,
103-
CompletedAt: sql.NullTime{
104-
Time:dbtime.Now(),
105-
Valid:true,
106-
},
107-
})
108110
ProvisionerJobResources(t,db,job.ID,seed.Transition,resources...)
109111
returnbuild
110112
}

‎coderd/database/dbgen/dbgen.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -395,9 +395,6 @@ func ProvisionerJob(t testing.TB, db database.Store, ps pubsub.Pubsub, orig data
395395
require.NoError(t,err)
396396
}
397397

398-
job,err=db.GetProvisionerJobByID(genCtx,jobID)
399-
require.NoError(t,err)
400-
401398
returnjob
402399
}
403400

‎coderd/workspaceagents_test.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,8 @@ func TestWorkspaceAgent(t *testing.T) {
153153
SshHelper:true,
154154
}
155155
dbfake.WorkspaceBuild(t,db,ws, database.WorkspaceBuild{},&proto.Resource{
156-
Name:"example",
157-
Type:"aws_instance",
158156
Agents: []*proto.Agent{
159157
{
160-
Id:uuid.NewString(),
161158
Directory:tmpDir,
162159
Auth:&proto.Agent_Token{
163160
Token:authToken,
@@ -196,11 +193,8 @@ func TestWorkspaceAgent(t *testing.T) {
196193
OwnerID:user.UserID,
197194
})
198195
dbfake.WorkspaceBuild(t,db,ws, database.WorkspaceBuild{},&proto.Resource{
199-
Name:"example",
200-
Type:"aws_instance",
201196
Agents: []*proto.Agent{
202197
{
203-
Id:uuid.NewString(),
204198
Directory:tmpDir,
205199
Auth:&proto.Agent_Token{
206200
Token:authToken,

0 commit comments

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