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

Commit294d238

Browse files
committed
fix more tests
1 parente1cb2cf commit294d238

File tree

11 files changed

+26
-26
lines changed

11 files changed

+26
-26
lines changed

‎coderd/database/dbauthz/dbauthz_test.go

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1655,10 +1655,7 @@ func (s *MethodTestSuite) TestWorkspace() {
16551655
build:=dbgen.WorkspaceBuild(s.T(),db, database.WorkspaceBuild{WorkspaceID:ws.ID,JobID:uuid.New()})
16561656
res:=dbgen.WorkspaceResource(s.T(),db, database.WorkspaceResource{JobID:build.JobID})
16571657
agt:=dbgen.WorkspaceAgent(s.T(),db, database.WorkspaceAgent{ResourceID:res.ID})
1658-
check.Args(agt.ID).Asserts(ws,policy.ActionRead).Returns(database.Workspace{
1659-
Workspace:ws,
1660-
TemplateName:tpl.Name,
1661-
})
1658+
check.Args(agt.ID).Asserts(ws,policy.ActionRead)
16621659
}))
16631660
s.Run("GetWorkspaceAgentsInLatestBuildByWorkspaceID",s.Subtest(func(db database.Store,check*expects) {
16641661
tpl:=dbgen.Template(s.T(),db, database.Template{})
@@ -1676,7 +1673,7 @@ func (s *MethodTestSuite) TestWorkspace() {
16761673
OwnerID:ws.OwnerID,
16771674
Deleted:ws.Deleted,
16781675
Name:ws.Name,
1679-
}).Asserts(ws,policy.ActionRead).Returns(ws)
1676+
}).Asserts(ws,policy.ActionRead)
16801677
}))
16811678
s.Run("GetWorkspaceResourceByID",s.Subtest(func(db database.Store,check*expects) {
16821679
ws:=dbgen.Workspace(s.T(),db, database.WorkspaceTable{})
@@ -1881,7 +1878,7 @@ func (s *MethodTestSuite) TestWorkspace() {
18811878
res:=dbgen.WorkspaceResource(s.T(),db, database.WorkspaceResource{JobID:build.JobID})
18821879
agt:=dbgen.WorkspaceAgent(s.T(),db, database.WorkspaceAgent{ResourceID:res.ID})
18831880
app:=dbgen.WorkspaceApp(s.T(),db, database.WorkspaceApp{AgentID:agt.ID})
1884-
check.Args(app.ID).Asserts(ws,policy.ActionRead).Returns(ws)
1881+
check.Args(app.ID).Asserts(ws,policy.ActionRead)
18851882
}))
18861883
s.Run("ActivityBumpWorkspace",s.Subtest(func(db database.Store,check*expects) {
18871884
ws:=dbgen.Workspace(s.T(),db, database.WorkspaceTable{})
@@ -2457,13 +2454,13 @@ func (s *MethodTestSuite) TestSystemFunctions() {
24572454
Asserts(tpl,policy.ActionRead).Errors(sql.ErrNoRows)
24582455
}))
24592456
s.Run("GetWorkspaceAppsByAgentIDs",s.Subtest(func(db database.Store,check*expects) {
2460-
aWs:=dbgen.Workspace(s.T(),db, database.Workspace{})
2457+
aWs:=dbgen.Workspace(s.T(),db, database.WorkspaceTable{})
24612458
aBuild:=dbgen.WorkspaceBuild(s.T(),db, database.WorkspaceBuild{WorkspaceID:aWs.ID,JobID:uuid.New()})
24622459
aRes:=dbgen.WorkspaceResource(s.T(),db, database.WorkspaceResource{JobID:aBuild.JobID})
24632460
aAgt:=dbgen.WorkspaceAgent(s.T(),db, database.WorkspaceAgent{ResourceID:aRes.ID})
24642461
a:=dbgen.WorkspaceApp(s.T(),db, database.WorkspaceApp{AgentID:aAgt.ID})
24652462

2466-
bWs:=dbgen.Workspace(s.T(),db, database.Workspace{})
2463+
bWs:=dbgen.Workspace(s.T(),db, database.WorkspaceTable{})
24672464
bBuild:=dbgen.WorkspaceBuild(s.T(),db, database.WorkspaceBuild{WorkspaceID:bWs.ID,JobID:uuid.New()})
24682465
bRes:=dbgen.WorkspaceResource(s.T(),db, database.WorkspaceResource{JobID:bBuild.JobID})
24692466
bAgt:=dbgen.WorkspaceAgent(s.T(),db, database.WorkspaceAgent{ResourceID:bRes.ID})
@@ -2478,15 +2475,15 @@ func (s *MethodTestSuite) TestSystemFunctions() {
24782475
v:=dbgen.TemplateVersion(s.T(),db, database.TemplateVersion{TemplateID: uuid.NullUUID{UUID:tpl.ID,Valid:true},JobID:uuid.New()})
24792476
tJob:=dbgen.ProvisionerJob(s.T(),db,nil, database.ProvisionerJob{ID:v.JobID,Type:database.ProvisionerJobTypeTemplateVersionImport})
24802477

2481-
ws:=dbgen.Workspace(s.T(),db, database.Workspace{})
2478+
ws:=dbgen.Workspace(s.T(),db, database.WorkspaceTable{})
24822479
build:=dbgen.WorkspaceBuild(s.T(),db, database.WorkspaceBuild{WorkspaceID:ws.ID,JobID:uuid.New()})
24832480
wJob:=dbgen.ProvisionerJob(s.T(),db,nil, database.ProvisionerJob{ID:build.JobID,Type:database.ProvisionerJobTypeWorkspaceBuild})
24842481
check.Args([]uuid.UUID{tJob.ID,wJob.ID}).
24852482
Asserts(rbac.ResourceSystem,policy.ActionRead).
24862483
Returns([]database.WorkspaceResource{})
24872484
}))
24882485
s.Run("GetWorkspaceResourceMetadataByResourceIDs",s.Subtest(func(db database.Store,check*expects) {
2489-
ws:=dbgen.Workspace(s.T(),db, database.Workspace{})
2486+
ws:=dbgen.Workspace(s.T(),db, database.WorkspaceTable{})
24902487
build:=dbgen.WorkspaceBuild(s.T(),db, database.WorkspaceBuild{WorkspaceID:ws.ID,JobID:uuid.New()})
24912488
_=dbgen.ProvisionerJob(s.T(),db,nil, database.ProvisionerJob{ID:build.JobID,Type:database.ProvisionerJobTypeWorkspaceBuild})
24922489
a:=dbgen.WorkspaceResource(s.T(),db, database.WorkspaceResource{JobID:build.JobID})
@@ -2495,7 +2492,7 @@ func (s *MethodTestSuite) TestSystemFunctions() {
24952492
Asserts(rbac.ResourceSystem,policy.ActionRead)
24962493
}))
24972494
s.Run("GetWorkspaceAgentsByResourceIDs",s.Subtest(func(db database.Store,check*expects) {
2498-
ws:=dbgen.Workspace(s.T(),db, database.Workspace{})
2495+
ws:=dbgen.Workspace(s.T(),db, database.WorkspaceTable{})
24992496
build:=dbgen.WorkspaceBuild(s.T(),db, database.WorkspaceBuild{WorkspaceID:ws.ID,JobID:uuid.New()})
25002497
res:=dbgen.WorkspaceResource(s.T(),db, database.WorkspaceResource{JobID:build.JobID})
25012498
agt:=dbgen.WorkspaceAgent(s.T(),db, database.WorkspaceAgent{ResourceID:res.ID})
@@ -2529,7 +2526,7 @@ func (s *MethodTestSuite) TestSystemFunctions() {
25292526
}).Asserts(rbac.ResourceSystem,policy.ActionCreate)
25302527
}))
25312528
s.Run("UpdateWorkspaceAgentConnectionByID",s.Subtest(func(db database.Store,check*expects) {
2532-
ws:=dbgen.Workspace(s.T(),db, database.Workspace{})
2529+
ws:=dbgen.Workspace(s.T(),db, database.WorkspaceTable{})
25332530
build:=dbgen.WorkspaceBuild(s.T(),db, database.WorkspaceBuild{WorkspaceID:ws.ID,JobID:uuid.New()})
25342531
res:=dbgen.WorkspaceResource(s.T(),db, database.WorkspaceResource{JobID:build.JobID})
25352532
agt:=dbgen.WorkspaceAgent(s.T(),db, database.WorkspaceAgent{ResourceID:res.ID})
@@ -2772,7 +2769,7 @@ func (s *MethodTestSuite) TestSystemFunctions() {
27722769
check.Args(uuid.New()).Asserts(rbac.ResourceSystem,policy.ActionRead)
27732770
}))
27742771
s.Run("GetJFrogXrayScanByWorkspaceAndAgentID",s.Subtest(func(db database.Store,check*expects) {
2775-
ws:=dbgen.Workspace(s.T(),db, database.Workspace{})
2772+
ws:=dbgen.Workspace(s.T(),db, database.WorkspaceTable{})
27762773
agent:=dbgen.WorkspaceAgent(s.T(),db, database.WorkspaceAgent{})
27772774

27782775
err:=db.UpsertJFrogXrayScanByWorkspaceAndAgentID(context.Background(), database.UpsertJFrogXrayScanByWorkspaceAndAgentIDParams{
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
DROPVIEW workspaces_expanded;

‎coderd/httpmw/workspaceagent_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ func TestWorkspaceAgent(t *testing.T) {
9797
})
9898
}
9999

100-
funcsetup(t testing.TB,db database.Store,authToken uuid.UUID,mwfunc(http.Handler) http.Handler) (*http.Request, http.Handler, database.Workspace, database.TemplateVersion) {
100+
funcsetup(t testing.TB,db database.Store,authToken uuid.UUID,mwfunc(http.Handler) http.Handler) (*http.Request, http.Handler, database.WorkspaceTable, database.TemplateVersion) {
101101
t.Helper()
102102
org:=dbgen.Organization(t,db, database.Organization{})
103103
user:=dbgen.User(t,db, database.User{

‎coderd/httpmw/workspacebuildparam_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
funcTestWorkspaceBuildParam(t*testing.T) {
2121
t.Parallel()
2222

23-
setupAuthentication:=func(db database.Store) (*http.Request, database.Workspace) {
23+
setupAuthentication:=func(db database.Store) (*http.Request, database.WorkspaceTable) {
2424
var (
2525
user=dbgen.User(t,db, database.User{})
2626
_,token=dbgen.APIKey(t,db, database.APIKey{

‎coderd/provisionerdserver/provisionerdserver.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1406,7 +1406,7 @@ func (s *server) CompleteJob(ctx context.Context, completed *proto.CompletedJob)
14061406
TemplateScheduleStore:*s.TemplateScheduleStore.Load(),
14071407
UserQuietHoursScheduleStore:*s.UserQuietHoursScheduleStore.Load(),
14081408
Now:now,
1409-
Workspace:workspace,
1409+
Workspace:workspace.WorkspaceTable(),
14101410
// Allowed to be the empty string.
14111411
WorkspaceAutostart:workspace.AutostartSchedule.String,
14121412
})

‎coderd/provisionerdserver/provisionerdserver_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1263,7 +1263,7 @@ func TestCompleteJob(t *testing.T) {
12631263
Valid:true,
12641264
}
12651265
}
1266-
workspace:=dbgen.Workspace(t,db, database.WorkspaceTable{
1266+
workspaceTable:=dbgen.Workspace(t,db, database.WorkspaceTable{
12671267
TemplateID:template.ID,
12681268
Ttl:workspaceTTL,
12691269
OwnerID:user.ID,
@@ -1278,7 +1278,7 @@ func TestCompleteJob(t *testing.T) {
12781278
JobID:uuid.New(),
12791279
})
12801280
build:=dbgen.WorkspaceBuild(t,db, database.WorkspaceBuild{
1281-
WorkspaceID:workspace.ID,
1281+
WorkspaceID:workspaceTable.ID,
12821282
TemplateVersionID:version.ID,
12831283
Transition:c.transition,
12841284
Reason:database.BuildReasonInitiator,
@@ -1331,7 +1331,7 @@ func TestCompleteJob(t *testing.T) {
13311331
<-publishedWorkspace
13321332
<-publishedLogs
13331333

1334-
workspace,err=db.GetWorkspaceByID(ctx,workspace.ID)
1334+
workspace,err:=db.GetWorkspaceByID(ctx,workspaceTable.ID)
13351335
require.NoError(t,err)
13361336
require.Equal(t,c.transition==database.WorkspaceTransitionDelete,workspace.Deleted)
13371337

@@ -1622,7 +1622,7 @@ func TestNotifications(t *testing.T) {
16221622
template,err:=db.GetTemplateByID(ctx,template.ID)
16231623
require.NoError(t,err)
16241624
file:=dbgen.File(t,db, database.File{CreatedBy:user.ID})
1625-
workspace:=dbgen.Workspace(t,db, database.WorkspaceTable{
1625+
workspaceTable:=dbgen.Workspace(t,db, database.WorkspaceTable{
16261626
TemplateID:template.ID,
16271627
OwnerID:user.ID,
16281628
OrganizationID:pd.OrganizationID,
@@ -1636,7 +1636,7 @@ func TestNotifications(t *testing.T) {
16361636
JobID:uuid.New(),
16371637
})
16381638
build:=dbgen.WorkspaceBuild(t,db, database.WorkspaceBuild{
1639-
WorkspaceID:workspace.ID,
1639+
WorkspaceID:workspaceTable.ID,
16401640
TemplateVersionID:version.ID,
16411641
InitiatorID:initiator.ID,
16421642
Transition:database.WorkspaceTransitionDelete,
@@ -1674,7 +1674,7 @@ func TestNotifications(t *testing.T) {
16741674
})
16751675
require.NoError(t,err)
16761676

1677-
workspace,err=db.GetWorkspaceByID(ctx,workspace.ID)
1677+
workspace,err:=db.GetWorkspaceByID(ctx,workspaceTable.ID)
16781678
require.NoError(t,err)
16791679
require.True(t,workspace.Deleted)
16801680

‎coderd/schedule/autostop.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ type CalculateAutostopParams struct {
5151
WorkspaceAutostartstring
5252

5353
Now time.Time
54-
Workspace database.Workspace
54+
Workspace database.WorkspaceTable
5555
}
5656

5757
typeAutostopTimestruct {

‎coderd/workspacestats/batcher_internal_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ type deps struct {
162162
Agent database.WorkspaceAgent
163163
Template database.Template
164164
User database.User
165-
Workspace database.Workspace
165+
Workspace database.WorkspaceTable
166166
}
167167

168168
// setupDeps sets up a set of test dependencies.

‎enterprise/coderd/jfrog_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func TestJFrogXrayScan(t *testing.T) {
8585

8686
memberClient,member:=coderdtest.CreateAnotherUser(t,ownerClient,owner.OrganizationID)
8787

88-
wsResp:=dbfake.WorkspaceBuild(t,db, database.Workspace{
88+
wsResp:=dbfake.WorkspaceBuild(t,db, database.WorkspaceTable{
8989
OrganizationID:owner.OrganizationID,
9090
OwnerID:member.ID,
9191
}).WithAgent().Do()

‎enterprise/coderd/schedule/template.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ func (s *EnterpriseTemplateScheduleStore) updateWorkspaceBuild(ctx context.Conte
296296
UserQuietHoursScheduleStore:*s.UserQuietHoursScheduleStore.Load(),
297297
// Use the job completion time as the time we calculate autostop from.
298298
Now:job.CompletedAt.Time,
299-
Workspace:workspace,
299+
Workspace:workspace.WorkspaceTable(),
300300
WorkspaceAutostart:workspace.AutostartSchedule.String,
301301
})
302302
iferr!=nil {

‎testutil/reflect.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ func populateValue(v reflect.Value, r *Random) (reflect.Value, error) {
7171
casereflect.TypeOf(time.Time{}):
7272
v.Set(reflect.ValueOf(time.Date(2020,5,2,5,19,21,30,time.UTC)))
7373
returnv,nil
74+
default:
75+
// Go to Kind instead
7476
}
7577

7678
switchv.Kind() {

0 commit comments

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