From 19b352e271d494f3d2c21ef9dc10638e39b17fd0 Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Wed, 13 Sep 2023 11:02:14 +0200 Subject: [PATCH 1/3] fix: wait for template version job --- coderd/templates_test.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/coderd/templates_test.go b/coderd/templates_test.go index fc623383b8d85..05ca75bf6da8d 100644 --- a/coderd/templates_test.go +++ b/coderd/templates_test.go @@ -475,6 +475,8 @@ func TestPatchTemplateMeta(t *testing.T) { user := coderdtest.CreateFirstUser(t, client) version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil) template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID) + coderdtest.AwaitTemplateVersionJob(t, client, version.ID) + req := codersdk.UpdateTemplateMeta{ Name: "new-template-name", DisplayName: "Displayed Name 456", @@ -483,6 +485,7 @@ func TestPatchTemplateMeta(t *testing.T) { DefaultTTLMillis: 12 * time.Hour.Milliseconds(), AllowUserCancelWorkspaceJobs: false, } + // It is unfortunate we need to sleep, but the test can fail if the // updatedAt is too close together. time.Sleep(time.Millisecond * 5) @@ -524,6 +527,7 @@ func TestPatchTemplateMeta(t *testing.T) { template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID, func(ctr *codersdk.CreateTemplateRequest) { ctr.DefaultTTLMillis = ptr.Ref(24 * time.Hour.Milliseconds()) }) + req := codersdk.UpdateTemplateMeta{ DefaultTTLMillis: 0, } @@ -553,6 +557,7 @@ func TestPatchTemplateMeta(t *testing.T) { template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID, func(ctr *codersdk.CreateTemplateRequest) { ctr.DefaultTTLMillis = ptr.Ref(24 * time.Hour.Milliseconds()) }) + req := codersdk.UpdateTemplateMeta{ DefaultTTLMillis: -1, } @@ -764,7 +769,7 @@ func TestPatchTemplateMeta(t *testing.T) { ctr.TimeTilDormantMillis = ptr.Ref(0 * time.Hour.Milliseconds()) ctr.TimeTilDormantAutoDeleteMillis = ptr.Ref(0 * time.Hour.Milliseconds()) }) - + q ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() @@ -819,6 +824,7 @@ func TestPatchTemplateMeta(t *testing.T) { template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID, func(ctr *codersdk.CreateTemplateRequest) { ctr.DefaultTTLMillis = ptr.Ref(24 * time.Hour.Milliseconds()) }) + require.Equal(t, allowAutostart.Load(), template.AllowUserAutostart) require.Equal(t, allowAutostop.Load(), template.AllowUserAutostop) From 477b650354cf46ec5bd53abc1782a76a83e9f303 Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Wed, 13 Sep 2023 11:03:12 +0200 Subject: [PATCH 2/3] fix --- coderd/templates_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coderd/templates_test.go b/coderd/templates_test.go index 05ca75bf6da8d..12ecf4de71328 100644 --- a/coderd/templates_test.go +++ b/coderd/templates_test.go @@ -769,7 +769,7 @@ func TestPatchTemplateMeta(t *testing.T) { ctr.TimeTilDormantMillis = ptr.Ref(0 * time.Hour.Milliseconds()) ctr.TimeTilDormantAutoDeleteMillis = ptr.Ref(0 * time.Hour.Milliseconds()) }) - q + ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) defer cancel() From 2b17ab3a03692e65f0482e2d8872548825cfefcf Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Wed, 13 Sep 2023 11:04:47 +0200 Subject: [PATCH 3/3] fix --- coderd/templates_test.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/coderd/templates_test.go b/coderd/templates_test.go index 12ecf4de71328..e4b7713dc4a4d 100644 --- a/coderd/templates_test.go +++ b/coderd/templates_test.go @@ -485,7 +485,6 @@ func TestPatchTemplateMeta(t *testing.T) { DefaultTTLMillis: 12 * time.Hour.Milliseconds(), AllowUserCancelWorkspaceJobs: false, } - // It is unfortunate we need to sleep, but the test can fail if the // updatedAt is too close together. time.Sleep(time.Millisecond * 5) @@ -527,7 +526,6 @@ func TestPatchTemplateMeta(t *testing.T) { template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID, func(ctr *codersdk.CreateTemplateRequest) { ctr.DefaultTTLMillis = ptr.Ref(24 * time.Hour.Milliseconds()) }) - req := codersdk.UpdateTemplateMeta{ DefaultTTLMillis: 0, } @@ -557,7 +555,6 @@ func TestPatchTemplateMeta(t *testing.T) { template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID, func(ctr *codersdk.CreateTemplateRequest) { ctr.DefaultTTLMillis = ptr.Ref(24 * time.Hour.Milliseconds()) }) - req := codersdk.UpdateTemplateMeta{ DefaultTTLMillis: -1, } @@ -824,7 +821,6 @@ func TestPatchTemplateMeta(t *testing.T) { template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID, func(ctr *codersdk.CreateTemplateRequest) { ctr.DefaultTTLMillis = ptr.Ref(24 * time.Hour.Milliseconds()) }) - require.Equal(t, allowAutostart.Load(), template.AllowUserAutostart) require.Equal(t, allowAutostop.Load(), template.AllowUserAutostop)