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

test(cli): fix race in provisioner list statuses for golden files#16205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
mafredri merged 1 commit intomainfrommafredri/test-fix-provisioner-status-flake
Jan 21, 2025
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletionscli/provisioners_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ func TestProvisioners_Golden(t *testing.T) {
memberClient,member:=coderdtest.CreateAnotherUser(t,client,owner.OrganizationID)

// Create initial resources with a running provisioner.
firstProvisioner:=coderdtest.NewProvisionerDaemon(t,coderdAPI)
firstProvisioner:=coderdtest.NewTaggedProvisionerDaemon(t,coderdAPI,"default-provisioner",map[string]string{"owner":"","scope":"organization"})
t.Cleanup(func() {_=firstProvisioner.Close() })
version:=coderdtest.CreateTemplateVersion(t,client,owner.OrganizationID,completeWithAgent())
coderdtest.AwaitTemplateVersionJobCompleted(t,client,version.ID)
Expand All@@ -92,10 +92,11 @@ func TestProvisioners_Golden(t *testing.T) {

// Create a provisioner that's working on a job.
pd1:=dbgen.ProvisionerDaemon(t,coderdAPI.Database, database.ProvisionerDaemon{
Name:"provisioner-1",
CreatedAt:dbtime.Now().Add(1*time.Second),
KeyID:uuid.MustParse(codersdk.ProvisionerKeyIDBuiltIn),
Tags: database.StringMap{"owner":"","scope":"organization","foo":"bar"},
Name:"provisioner-1",
CreatedAt:dbtime.Now().Add(1*time.Second),
LastSeenAt: sql.NullTime{Time:coderdAPI.Clock.Now().Add(time.Hour),Valid:true},// Stale interval can't be adjusted, keep online.
KeyID:uuid.MustParse(codersdk.ProvisionerKeyIDBuiltIn),
Tags: database.StringMap{"owner":"","scope":"organization","foo":"bar"},
})
w1:=dbgen.Workspace(t,coderdAPI.Database, database.WorkspaceTable{
OwnerID:member.ID,
Expand DownExpand Up@@ -164,10 +165,11 @@ func TestProvisioners_Golden(t *testing.T) {

// Create a provisioner that is idle.
_=dbgen.ProvisionerDaemon(t,coderdAPI.Database, database.ProvisionerDaemon{
Name:"provisioner-3",
CreatedAt:dbtime.Now().Add(3*time.Second),
KeyID:uuid.MustParse(codersdk.ProvisionerKeyIDBuiltIn),
Tags: database.StringMap{"owner":"","scope":"organization"},
Name:"provisioner-3",
CreatedAt:dbtime.Now().Add(3*time.Second),
LastSeenAt: sql.NullTime{Time:coderdAPI.Clock.Now().Add(time.Hour),Valid:true},// Stale interval can't be adjusted, keep online.
KeyID:uuid.MustParse(codersdk.ProvisionerKeyIDBuiltIn),
Tags: database.StringMap{"owner":"","scope":"organization"},
})

updateReplaceUUIDs(coderdAPI)
Expand Down
10 changes: 5 additions & 5 deletionscli/testdata/TestProvisioners_Golden/list.golden
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
ID CREATED AT LAST SEEN AT NAME VERSION TAGS KEY NAME STATUS CURRENT JOB ID CURRENT JOB STATUS PREVIOUS JOB ID PREVIOUS JOB STATUS ORGANIZATION
00000000-0000-0000-aaaa-000000000001 ====[timestamp]===== ====[timestamp]=====provisioner-1 v0.0.0map[foo:barowner: scope:organization]built-in busy00000000-0000-0000-bbbb-000000000002 running<nil><nil> Coder
00000000-0000-0000-aaaa-000000000002 ====[timestamp]===== ====[timestamp]===== provisioner-2v0.0.0 map[owner: scope:organization] built-in offline <nil><nil>00000000-0000-0000-bbbb-000000000003 succeeded Coder
00000000-0000-0000-aaaa-000000000003 ====[timestamp]===== ====[timestamp]===== provisioner-3v0.0.0 map[owner: scope:organization] built-inidle<nil> <nil><nil> <nil> Coder
00000000-0000-0000-aaaa-000000000000 ====[timestamp]===== ====[timestamp]=====testv0.0.0-develmap[owner: scope:organization] built-in idle <nil> <nil>00000000-0000-0000-bbbb-000000000001 succeeded Coder
ID CREATED AT LAST SEEN AT NAMEVERSION TAGS KEY NAME STATUS CURRENT JOB ID CURRENT JOB STATUS PREVIOUS JOB ID PREVIOUS JOB STATUS ORGANIZATION
00000000-0000-0000-aaaa-000000000000 ====[timestamp]===== ====[timestamp]=====default-provisioner v0.0.0-develmap[owner: scope:organization] built-in idle<nil><nil> 00000000-0000-0000-bbbb-000000000001 succeeded Coder
00000000-0000-0000-aaaa-000000000001 ====[timestamp]===== ====[timestamp]===== provisioner-1v0.0.0 map[foo:barowner: scope:organization]built-in busy00000000-0000-0000-bbbb-000000000002 running<nil><nil> Coder
00000000-0000-0000-aaaa-000000000002 ====[timestamp]===== ====[timestamp]===== provisioner-2v0.0.0 map[owner: scope:organization] built-inoffline<nil> <nil>00000000-0000-0000-bbbb-000000000003 succeeded Coder
00000000-0000-0000-aaaa-000000000003 ====[timestamp]===== ====[timestamp]=====provisioner-3 v0.0.0map[owner: scope:organization] built-in idle <nil> <nil><nil> <nil> Coder
Loading
[8]ページ先頭
©2009-2025 Movatter.jp