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

Commitc1f421d

Browse files
refactor(coderd/database): use empty tag sets
1 parent5aa0ffa commitc1f421d

File tree

1 file changed

+20
-18
lines changed

1 file changed

+20
-18
lines changed

‎coderd/database/querier_test.go

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1262,7 +1262,7 @@ func TestQueuePosition(t *testing.T) {
12621262
Provisioners: []database.ProvisionerType{database.ProvisionerTypeEcho},
12631263
// Ensure the `tags` field is NOT NULL for the default provisioner;
12641264
// otherwise, it won't be able to pick up any jobs.
1265-
Tags: database.StringMap{"a":"1"},
1265+
Tags: database.StringMap{},
12661266
})
12671267

12681268
queued,err:=db.GetProvisionerJobsByIDsWithQueuePosition(ctx,jobIDs)
@@ -2421,7 +2421,6 @@ func TestGetProvisionerJobsByIDsWithQueuePosition_MixedStatuses(t *testing.T) {
24212421
now:=dbtime.Now()
24222422
ctx:=testutil.Context(t,testutil.WaitShort)
24232423

2424-
defaultTags:= database.StringMap{"a":"1"}
24252424
// Create the following provisioner jobs:
24262425
allJobs:= []database.ProvisionerJob{
24272426
// Pending. This will be the last in the queue because
@@ -2432,7 +2431,9 @@ func TestGetProvisionerJobsByIDsWithQueuePosition_MixedStatuses(t *testing.T) {
24322431
CanceledAt: sql.NullTime{},
24332432
CompletedAt: sql.NullTime{},
24342433
Error: sql.NullString{},
2435-
Tags:defaultTags,
2434+
// Ensure the `tags` field is NOT NULL for both provisioner jobs and provisioner daemons;
2435+
// otherwise, provisioner daemons won't be able to pick up any jobs.
2436+
Tags: database.StringMap{},
24362437
}),
24372438

24382439
// Another pending. This will come first in the queue
@@ -2443,7 +2444,7 @@ func TestGetProvisionerJobsByIDsWithQueuePosition_MixedStatuses(t *testing.T) {
24432444
CanceledAt: sql.NullTime{},
24442445
CompletedAt: sql.NullTime{},
24452446
Error: sql.NullString{},
2446-
Tags:defaultTags,
2447+
Tags:database.StringMap{},
24472448
}),
24482449

24492450
// Running
@@ -2453,7 +2454,7 @@ func TestGetProvisionerJobsByIDsWithQueuePosition_MixedStatuses(t *testing.T) {
24532454
CanceledAt: sql.NullTime{},
24542455
CompletedAt: sql.NullTime{},
24552456
Error: sql.NullString{},
2456-
Tags:defaultTags,
2457+
Tags:database.StringMap{},
24572458
}),
24582459

24592460
// Succeeded
@@ -2463,7 +2464,7 @@ func TestGetProvisionerJobsByIDsWithQueuePosition_MixedStatuses(t *testing.T) {
24632464
CanceledAt: sql.NullTime{},
24642465
CompletedAt: sql.NullTime{Valid:true,Time:now},
24652466
Error: sql.NullString{},
2466-
Tags:defaultTags,
2467+
Tags:database.StringMap{},
24672468
}),
24682469

24692470
// Canceling
@@ -2473,7 +2474,7 @@ func TestGetProvisionerJobsByIDsWithQueuePosition_MixedStatuses(t *testing.T) {
24732474
CanceledAt: sql.NullTime{Valid:true,Time:now},
24742475
CompletedAt: sql.NullTime{},
24752476
Error: sql.NullString{},
2476-
Tags:defaultTags,
2477+
Tags:database.StringMap{},
24772478
}),
24782479

24792480
// Canceled
@@ -2483,7 +2484,7 @@ func TestGetProvisionerJobsByIDsWithQueuePosition_MixedStatuses(t *testing.T) {
24832484
CanceledAt: sql.NullTime{Valid:true,Time:now},
24842485
CompletedAt: sql.NullTime{Valid:true,Time:now},
24852486
Error: sql.NullString{},
2486-
Tags:defaultTags,
2487+
Tags:database.StringMap{},
24872488
}),
24882489

24892490
// Failed
@@ -2493,15 +2494,15 @@ func TestGetProvisionerJobsByIDsWithQueuePosition_MixedStatuses(t *testing.T) {
24932494
CanceledAt: sql.NullTime{},
24942495
CompletedAt: sql.NullTime{},
24952496
Error: sql.NullString{String:"failed",Valid:true},
2496-
Tags:defaultTags,
2497+
Tags:database.StringMap{},
24972498
}),
24982499
}
24992500

25002501
// Create default provisioner daemon:
25012502
dbgen.ProvisionerDaemon(t,db, database.ProvisionerDaemon{
25022503
Name:"default_provisioner",
25032504
Provisioners: []database.ProvisionerType{database.ProvisionerTypeEcho},
2504-
Tags:defaultTags,
2505+
Tags:database.StringMap{},
25052506
})
25062507

25072508
// Assert invariant: the jobs are in the expected order
@@ -2561,45 +2562,46 @@ func TestGetProvisionerJobsByIDsWithQueuePosition_OrderValidation(t *testing.T)
25612562
now:=dbtime.Now()
25622563
ctx:=testutil.Context(t,testutil.WaitShort)
25632564

2564-
defaultTags:= database.StringMap{"a":"1"}
25652565
// Create the following provisioner jobs:
25662566
allJobs:= []database.ProvisionerJob{
25672567
dbgen.ProvisionerJob(t,db,nil, database.ProvisionerJob{
25682568
CreatedAt:now.Add(-4*time.Minute),
2569-
Tags:defaultTags,
2569+
// Ensure the `tags` field is NOT NULL for both provisioner jobs and provisioner daemons;
2570+
// otherwise, provisioner daemons won't be able to pick up any jobs.
2571+
Tags: database.StringMap{},
25702572
}),
25712573

25722574
dbgen.ProvisionerJob(t,db,nil, database.ProvisionerJob{
25732575
CreatedAt:now.Add(-5*time.Minute),
2574-
Tags:defaultTags,
2576+
Tags:database.StringMap{},
25752577
}),
25762578

25772579
dbgen.ProvisionerJob(t,db,nil, database.ProvisionerJob{
25782580
CreatedAt:now.Add(-6*time.Minute),
2579-
Tags:defaultTags,
2581+
Tags:database.StringMap{},
25802582
}),
25812583

25822584
dbgen.ProvisionerJob(t,db,nil, database.ProvisionerJob{
25832585
CreatedAt:now.Add(-3*time.Minute),
2584-
Tags:defaultTags,
2586+
Tags:database.StringMap{},
25852587
}),
25862588

25872589
dbgen.ProvisionerJob(t,db,nil, database.ProvisionerJob{
25882590
CreatedAt:now.Add(-2*time.Minute),
2589-
Tags:defaultTags,
2591+
Tags:database.StringMap{},
25902592
}),
25912593

25922594
dbgen.ProvisionerJob(t,db,nil, database.ProvisionerJob{
25932595
CreatedAt:now.Add(-1*time.Minute),
2594-
Tags:defaultTags,
2596+
Tags:database.StringMap{},
25952597
}),
25962598
}
25972599

25982600
// Create default provisioner daemon:
25992601
dbgen.ProvisionerDaemon(t,db, database.ProvisionerDaemon{
26002602
Name:"default_provisioner",
26012603
Provisioners: []database.ProvisionerType{database.ProvisionerTypeEcho},
2602-
Tags:defaultTags,
2604+
Tags:database.StringMap{},
26032605
})
26042606

26052607
// Assert invariant: the jobs are in the expected order

0 commit comments

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