Clean up tests, amend PR comments

mafredri · mafredri · commit 6bfed73c87b3 · 2022-05-12T08:49:56.000Z
diff --git a/cli/templatecreate_test.go b/cli/templatecreate_test.go
@@ -25,25 +25,27 @@ func TestTemplateCreate(t *testing.T) {
 		cmd, root := clitest.New(t, "templates", "create", "my-template", "--directory", source, "--test.provisioner", string(database.ProvisionerTypeEcho))
 		clitest.SetupConfig(t, client, root)
 		_ = coderdtest.NewProvisionerDaemon(t, client)
-		doneChan := make(chan struct{})
 		pty := ptytest.New(t)
 		cmd.SetIn(pty.Input())
 		cmd.SetOut(pty.Output())
+
+		execDone := make(chan error)
 		go func() {
-			defer close(doneChan)
-			err := cmd.Execute()
-			require.NoError(t, err)
+			execDone <- cmd.Execute()
 		}()
-		matches := []string{
-			"Create and upload", "yes",
-			"Confirm create?", "yes",
+
+		matches := []struct {
+			match string
+			write string
+		}{
+			{match: "Create and upload", write: "yes"},
+			{match: "Confirm create?", write: "yes"},
 		}
-		for i := 0; i < len(matches); i += 2 {
-			match := matches[i]
-			value := matches[i+1]
-			pty.ExpectMatch(match)
-			pty.WriteLine(value)
+		for _, m := range matches {
+			pty.ExpectMatch(m.match)
+			pty.WriteLine(m.write)
 		}
-		<-doneChan
+
+		require.NoError(t, <-execDone)
 	})
 }
diff --git a/cli/templateupdate_test.go b/cli/templateupdate_test.go
@@ -35,22 +35,24 @@ func TestTemplateUpdate(t *testing.T) {
 	pty := ptytest.New(t)
 	cmd.SetIn(pty.Input())
 	cmd.SetOut(pty.Output())
-	done := make(chan struct{})
+
+	execDone := make(chan error)
 	go func() {
-		defer close(done)
-		err := cmd.Execute()
-		require.NoError(t, err)
+		execDone <- cmd.Execute()
 	}()
-	matches := []string{
-		"Upload", "yes",
+
+	matches := []struct {
+		match string
+		write string
+	}{
+		{match: "Upload", write: "yes"},
 	}
-	for i := 0; i < len(matches); i += 2 {
-		match := matches[i]
-		value := matches[i+1]
-		pty.ExpectMatch(match)
-		pty.WriteLine(value)
+	for _, m := range matches {
+		pty.ExpectMatch(m.match)
+		pty.WriteLine(m.write)
 	}
-	<-done
+
+	require.NoError(t, <-execDone)
 
 	// Assert that the template version changed.
 	templateVersions, err := client.TemplateVersionsByTemplate(context.Background(), codersdk.TemplateVersionsByTemplateRequest{
