From 62c4557baaaf18ac323cb46ac06302ae8ffdc584 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Wed, 30 Aug 2023 11:31:31 +0100 Subject: [PATCH 1/2] fix(cli): ignore log errors in template pull tests --- cli/templatepull_test.go | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/cli/templatepull_test.go b/cli/templatepull_test.go index 5a5e7bc6c9e06..2e9b783f6dcee 100644 --- a/cli/templatepull_test.go +++ b/cli/templatepull_test.go @@ -13,6 +13,8 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" + "cdr.dev/slog/sloggers/slogtest" + "github.com/coder/coder/v2/cli/clitest" "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/provisioner/echo" @@ -53,7 +55,11 @@ func TestTemplatePull_NoName(t *testing.T) { func TestTemplatePull_Stdout(t *testing.T) { t.Parallel() - client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) + logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: true}) + client := coderdtest.New(t, &coderdtest.Options{ + IncludeProvisionerDaemon: true, + Logger: &logger, + }) user := coderdtest.CreateFirstUser(t, client) // Create an initial template bundle. @@ -91,7 +97,11 @@ func TestTemplatePull_Stdout(t *testing.T) { func TestTemplatePull_ToDir(t *testing.T) { t.Parallel() - client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) + logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: true}) + client := coderdtest.New(t, &coderdtest.Options{ + IncludeProvisionerDaemon: true, + Logger: &logger, + }) user := coderdtest.CreateFirstUser(t, client) // Create an initial template bundle. @@ -138,7 +148,11 @@ func TestTemplatePull_ToDir(t *testing.T) { // and writes it to a directory with the name of the template if the path is not implicitly supplied. // nolint: paralleltest func TestTemplatePull_ToImplicit(t *testing.T) { - client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) + logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: true}) + client := coderdtest.New(t, &coderdtest.Options{ + IncludeProvisionerDaemon: true, + Logger: &logger, + }) user := coderdtest.CreateFirstUser(t, client) // Create an initial template bundle. @@ -196,7 +210,11 @@ func TestTemplatePull_ToImplicit(t *testing.T) { func TestTemplatePull_FolderConflict(t *testing.T) { t.Parallel() - client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) + logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: true}) + client := coderdtest.New(t, &coderdtest.Options{ + IncludeProvisionerDaemon: true, + Logger: &logger, + }) user := coderdtest.CreateFirstUser(t, client) // Create an initial template bundle. From 635534db239f13d5d063fc95f7f638fe1a027f1a Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Thu, 31 Aug 2023 09:16:13 +0100 Subject: [PATCH 2/2] await template version job instead of ignoring log errors --- cli/templatepull_test.go | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/cli/templatepull_test.go b/cli/templatepull_test.go index 2e9b783f6dcee..3f1cd50851ed3 100644 --- a/cli/templatepull_test.go +++ b/cli/templatepull_test.go @@ -13,8 +13,6 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" - "cdr.dev/slog/sloggers/slogtest" - "github.com/coder/coder/v2/cli/clitest" "github.com/coder/coder/v2/coderd/coderdtest" "github.com/coder/coder/v2/provisioner/echo" @@ -55,10 +53,8 @@ func TestTemplatePull_NoName(t *testing.T) { func TestTemplatePull_Stdout(t *testing.T) { t.Parallel() - logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: true}) client := coderdtest.New(t, &coderdtest.Options{ IncludeProvisionerDaemon: true, - Logger: &logger, }) user := coderdtest.CreateFirstUser(t, client) @@ -78,7 +74,8 @@ func TestTemplatePull_Stdout(t *testing.T) { // Update the template version so that we can assert that templates // are being sorted correctly. - _ = coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, source2, template.ID) + updatedVersion := coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, source2, template.ID) + _ = coderdtest.AwaitTemplateVersionJob(t, client, updatedVersion.ID) inv, root := clitest.New(t, "templates", "pull", "--tar", template.Name) clitest.SetupConfig(t, client, root) @@ -97,10 +94,8 @@ func TestTemplatePull_Stdout(t *testing.T) { func TestTemplatePull_ToDir(t *testing.T) { t.Parallel() - logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: true}) client := coderdtest.New(t, &coderdtest.Options{ IncludeProvisionerDaemon: true, - Logger: &logger, }) user := coderdtest.CreateFirstUser(t, client) @@ -120,7 +115,8 @@ func TestTemplatePull_ToDir(t *testing.T) { // Update the template version so that we can assert that templates // are being sorted correctly. - _ = coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, source2, template.ID) + updatedVersion := coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, source2, template.ID) + _ = coderdtest.AwaitTemplateVersionJob(t, client, updatedVersion.ID) dir := t.TempDir() @@ -148,10 +144,8 @@ func TestTemplatePull_ToDir(t *testing.T) { // and writes it to a directory with the name of the template if the path is not implicitly supplied. // nolint: paralleltest func TestTemplatePull_ToImplicit(t *testing.T) { - logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: true}) client := coderdtest.New(t, &coderdtest.Options{ IncludeProvisionerDaemon: true, - Logger: &logger, }) user := coderdtest.CreateFirstUser(t, client) @@ -171,7 +165,8 @@ func TestTemplatePull_ToImplicit(t *testing.T) { // Update the template version so that we can assert that templates // are being sorted correctly. - _ = coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, source2, template.ID) + updatedVersion := coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, source2, template.ID) + _ = coderdtest.AwaitTemplateVersionJob(t, client, updatedVersion.ID) // create a tempdir and change the working directory to it for the duration of the test (cannot run in parallel) dir := t.TempDir() @@ -210,10 +205,8 @@ func TestTemplatePull_ToImplicit(t *testing.T) { func TestTemplatePull_FolderConflict(t *testing.T) { t.Parallel() - logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: true}) client := coderdtest.New(t, &coderdtest.Options{ IncludeProvisionerDaemon: true, - Logger: &logger, }) user := coderdtest.CreateFirstUser(t, client) @@ -233,7 +226,8 @@ func TestTemplatePull_FolderConflict(t *testing.T) { // Update the template version so that we can assert that templates // are being sorted correctly. - _ = coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, source2, template.ID) + updatedVersion := coderdtest.UpdateTemplateVersion(t, client, user.OrganizationID, source2, template.ID) + _ = coderdtest.AwaitTemplateVersionJob(t, client, updatedVersion.ID) dir := t.TempDir()