8000 fix tests · coder/coder@5fac5ba · GitHub
[go: up one dir, main page]
Skip to content

Commit 5fac5ba

Browse files
SasSwartSasSwart
committed
fix tests
1 parent 53cc203 commit 5fac5ba

File tree

2 files changed

+26
-13
lines changed

2 files changed

+26
-13
lines changed

‎coderd/database/dbauthz/dbauthz_test.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2119,6 +2119,19 @@ func (s *MethodTestSuite) TestExtraMethods() {
21192119
s.NoError(err, "get provisioner daemon by org")
21202120
check.Args(database.GetProvisionerDaemonsByOrganizationParams{OrganizationID: org.ID}).Asserts(d, policy.ActionRead).Returns(ds)
21212121
}))
2122+
s.Run("GetProvisionerDaemonsByJobID", s.Subtest(func(db database.Store, check *expects) {
2123+
org := dbgen.Organization(s.T(), db, database.Organization{})
2124+
d, err := db.UpsertProvisionerDaemon(context.Background(), database.UpsertProvisionerDaemonParams{
2125+
OrganizationID: org.ID,
2126+
Tags: database.StringMap(map[string]string{
2127+
provisionersdk.TagScope: provisionersdk.ScopeOrganization,
2128+
}),
2129+
})
2130+
s.NoError(err, "insert provisioner daemon")
2131+
ds, err := db.GetProvisionerDaemonsByProvisionerJobs(context.Background(), []uuid.UUID{d.ID})
2132+
s.NoError(err, "get provisioner daemon by org")
2133+
check.Args(database.GetProvisionerDaemonsByOrganizationParams{OrganizationID: org.ID}).Asserts(d, policy.ActionRead).Returns(ds)
2134+
}))
21222135
s.Run("DeleteOldProvisionerDaemons", s.Subtest(func(db database.Store, check *expects) {
21232136
_, err := db.UpsertProvisionerDaemon(context.Background(), database.UpsertProvisionerDaemonParams{
21242137
Tags: database.StringMap(map[string]string{

‎coderd/wsbuilder/wsbuilder_test.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func TestBuilder_NoOptions(t *testing.T) {
6161
withRichParameters(nil),
6262
withParameterSchemas(inactiveJobID, nil),
6363
withWorkspaceTags(inactiveVersionID, nil),
64-
withProvisionerDaemons([]database.ProvisionerDaemon{}),
64+
withProvisionerDaemons([]database.GetProvisionerDaemonsByProvisionerJobsRow{}),
6565

6666
// Outputs
6767
expectProvisionerJob(func(job database.InsertProvisionerJobParams) {
@@ -116,7 +116,7 @@ func TestBuilder_Initiator(t *testing.T) {
116116
withRichParameters(nil),
117117
withParameterSchemas(inactiveJobID, nil),
118118
withWorkspaceTags(inactiveVersionID, nil),
119-
withProvisionerDaemons([]database.ProvisionerDaemon{}),
119+
withProvisionerDaemons([]database.GetProvisionerDaemonsByProvisionerJobsRow{}),
120120

121121
// Outputs
122122
expectProvisionerJob(func(job database.InsertProvisionerJobParams) {
@@ -161,7 +161,7 @@ func TestBuilder_Baggage(t *testing.T) {
161161
withRichParameters(nil),
162162
withParameterSchemas(inactiveJobID, nil),
163163
withWorkspaceTags(inactiveVersionID, nil),
164-
withProvisionerDaemons([]database.ProvisionerDaemon{}),
164+
withProvisionerDaemons([]database.GetProvisionerDaemonsByProvisionerJobsRow{}),
165165

166166
// Outputs
167167
expectProvisionerJob(func(job database.InsertProvisionerJobParams) {
@@ -198,7 +198,7 @@ func TestBuilder_Reason(t *testing.T) {
198198
withRichParameters(nil),
199199
withParameterSchemas(inactiveJobID, nil),
200200
withWorkspaceTags(inactiveVersionID, nil),
201-
withProvisionerDaemons([]database.ProvisionerDaemon{}),
201+
withProvisionerDaemons([]database.GetProvisionerDaemonsByProvisionerJobsRow{}),
202202

203203
// Outputs
204204
expectProvisionerJob(func(_ database.InsertProvisionerJobParams) {
@@ -234,7 +234,7 @@ func TestBuilder_ActiveVersion(t *testing.T) {
234234
withLastBuildNotFound,
235235
withParameterSchemas(activeJobID, nil),
236236
withWorkspaceTags(activeVersionID, nil),
237-
withProvisionerDaemons([]database.ProvisionerDaemon{}),
237+
withProvisionerDaemons([]database.GetProvisionerDaemonsByProvisionerJobsRow{}),
238238
// previous rich parameters are not queried because there is no previous build.
239239

240240
// Outputs
@@ -324,7 +324,7 @@ func TestWorkspaceBuildWithTags(t *testing.T) {
324324
withRichParameters(nil),
325325
withParameterSchemas(inactiveJobID, nil),
326326
withWorkspaceTags(inactiveVersionID, workspaceTags),
327-
withProvisionerDaemons([]database.ProvisionerDaemon{}),
327+
withProvisionerDaemons([]database.GetProvisionerDaemonsByProvisionerJobsRow{}),
328328

329329
// Outputs
330330
expectProvisionerJob(func(job database.InsertProvisionerJobParams) {
@@ -416,7 +416,7 @@ func TestWorkspaceBuildWithRichParameters(t *testing.T) {
416416
withRichParameters(initialBuildParameters),
417417
withParameterSchemas(inactiveJobID, nil),
418418
withWorkspaceTags(inactiveVersionID, nil),
419-
withProvisionerDaemons([]database.ProvisionerDaemon{}),
419+
withProvisionerDaemons([]database.GetProvisionerDaemonsByProvisionerJobsRow{}),
420420

421421
// Outputs
422422
expectProvisionerJob(func(job database.InsertProvisionerJobParams) {}),
@@ -462,7 +462,7 @@ func TestWorkspaceBuildWithRichParameters(t *testing.T) {
462462
withRichParameters(initialBuildParameters),
463463
withParameterSchemas(inactiveJobID, nil),
464464
withWorkspaceTags(inactiveVersionID, nil),
465-
withProvisionerDaemons([]database.ProvisionerDaemon{}),
465+
withProvisionerDaemons([]database.GetProvisionerDaemonsByProvisionerJobsRow{}),
466466

467467
// Outputs
468468
expectProvisionerJob(func(job database.InsertProvisionerJobParams) {}),
@@ -596,7 +596,7 @@ func TestWorkspaceBuildWithRichParameters(t *testing.T) {
596596
withRichParameters(initialBuildParameters),
597597
withParameterSchemas(activeJobID, nil),
598598
withWorkspaceTags(activeVersionID, nil),
599-
withProvisionerDaemons([]database.ProvisionerDaemon{}),
599+
withProvisionerDaemons([]database.GetProvisionerDaemonsByProvisionerJobsRow{}),
600600

601601
// Outputs
602602
expectProvisionerJob(func(job database.InsertProvisionerJobParams) {}),
@@ -658,7 +658,7 @@ func TestWorkspaceBuildWithRichParameters(t *testing.T) {
658658
withRichParameters(initialBuildParameters),
659659
withParameterSchemas(activeJobID, nil),
660660
withWorkspaceTags(activeVersionID, nil),
661-
withProvisionerDaemons([]database.ProvisionerDaemon{}),
661+
withProvisionerDaemons([]database.GetProvisionerDaemonsByProvisionerJobsRow{}),
662662

663663
// Outputs
664664
expectProvisionerJob(func(job database.InsertProvisionerJobParams) {}),
@@ -718,7 +718,7 @@ func TestWorkspaceBuildWithRichParameters(t *testing.T) {
718718
withRichParameters(initialBuildParameters),
719719
withParameterSchemas(activeJobID, nil),
720720
withWorkspaceTags(activeVersionID, nil),
721-
withProvisionerDaemons([]database.ProvisionerDaemon{}),
721+
withProvisionerDaemons([]database.GetProvisionerDaemonsByProvisionerJobsRow{}),
722722

723723
// Outputs
724724
expectProvisionerJob(func(job database.InsertProvisionerJobParams) {}),
@@ -1009,8 +1009,8 @@ func expectBuildParameters(
10091009
}
10101010
}
10111011

1012-
func withProvisionerDaemons(provisionerDaemons []database.ProvisionerDaemon) func(mTx *dbmock.MockStore) {
1012+
func withProvisionerDaemons(provisionerDaemons []database.GetProvisionerDaemonsByProvisionerJobsRow) func(mTx *dbmock.MockStore) {
10131013
return func(mTx *dbmock.MockStore) {
1014-
mTx.EXPECT().GetProvisionerDaemonsByOrganization(gomock.Any(), gomock.Any()).Return(provisionerDaemons, nil)
1014+
mTx.EXPECT().GetProvisionerDaemonsByProvisionerJobs(gomock.Any(), gomock.Any()).Return(provisionerDaemons, nil)
10151015
}
10161016
}

0 commit comments

Comments
 (0)
0