From e9c08681def54745d34c72682181e6915f7abd82 Mon Sep 17 00:00:00 2001
From: Colin Adler <colin1adler@gmail.com>
Date: Thu, 20 Apr 2023 14:47:39 -0500
Subject: [PATCH 1/2] fix(cli/clitest): race between `Start`/`StartWithWaiter`
 cleanup order

---
 cli/clitest/clitest.go | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/cli/clitest/clitest.go b/cli/clitest/clitest.go
index 52537d5ccf35d..4b9a49794f5d2 100644
--- a/cli/clitest/clitest.go
+++ b/cli/clitest/clitest.go
@@ -133,9 +133,16 @@ func Start(t *testing.T, inv *clibase.Invocation) {
 	t.Helper()
 
 	closeCh := make(chan struct{})
+	// StartWithWaiter adds its own `t.Cleanup`, so we need to be sure it's added
+	// before ours.
+	waiter := StartWithWaiter(t, inv)
+	t.Cleanup(func() {
+		<-closeCh
+	})
+
 	go func() {
 		defer close(closeCh)
-		err := StartWithWaiter(t, inv).Wait()
+		err := waiter.Wait()
 		switch {
 		case errors.Is(err, context.Canceled):
 			return
@@ -143,10 +150,6 @@ func Start(t *testing.T, inv *clibase.Invocation) {
 			assert.NoError(t, err)
 		}
 	}()
-
-	t.Cleanup(func() {
-		<-closeCh
-	})
 }
 
 // Run runs the command and asserts that there is no error.

From 2612baeed97f07b6eab8ec3e49db8e91d1c01920 Mon Sep 17 00:00:00 2001
From: Colin Adler <colin1adler@gmail.com>
Date: Thu, 20 Apr 2023 23:29:20 +0000
Subject: [PATCH 2/2] fixup! fix(cli/clitest): race between
 `Start`/`StartWithWaiter` cleanup order

---
 cli/templatecreate_test.go | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/cli/templatecreate_test.go b/cli/templatecreate_test.go
index 5bf688972e5ec..fdcfc5b63ab46 100644
--- a/cli/templatecreate_test.go
+++ b/cli/templatecreate_test.go
@@ -2,9 +2,11 @@ package cli_test
 
 import (
 	"bytes"
+	"context"
 	"os"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/coder/coder/cli/clitest"
@@ -13,6 +15,7 @@ import (
 	"github.com/coder/coder/provisioner/echo"
 	"github.com/coder/coder/provisionersdk/proto"
 	"github.com/coder/coder/pty/ptytest"
+	"github.com/coder/coder/testutil"
 )
 
 var provisionCompleteWithAgent = []*proto.Provision_Response{
@@ -290,11 +293,23 @@ func TestTemplateCreate(t *testing.T) {
 		removeTmpDirUntilSuccessAfterTest(t, tempDir)
 		variablesFile, _ := os.CreateTemp(tempDir, "variables*.yaml")
 		_, _ = variablesFile.WriteString(`second_variable: foobar`)
+
+		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
+		defer cancel()
+
 		inv, root := clitest.New(t, "templates", "create", "my-template", "--directory", source, "--test.provisioner", string(database.ProvisionerTypeEcho), "--variables-file", variablesFile.Name())
 		clitest.SetupConfig(t, client, root)
+		inv = inv.WithContext(ctx)
 		pty := ptytest.New(t).Attach(inv)
 
-		clitest.Start(t, inv)
+		// We expect the cli to return an error, so we have to handle it
+		// ourselves.
+		go func() {
+			cancel()
+			err := inv.Run()
+			assert.Error(t, err)
+		}()
+
 		matches := []struct {
 			match string
 			write string
@@ -307,6 +322,8 @@ func TestTemplateCreate(t *testing.T) {
 				pty.WriteLine(m.write)
 			}
 		}
+
+		<-ctx.Done()
 	})
 
 	t.Run("WithVariablesFileWithTheRequiredValue", func(t *testing.T) {
@@ -390,7 +407,9 @@ func TestTemplateCreate(t *testing.T) {
 		}
 		for _, m := range matches {
 			pty.ExpectMatch(m.match)
-			pty.WriteLine(m.write)
+			if len(m.write) > 0 {
+				pty.WriteLine(m.write)
+			}
 		}
 	})
 }