fix: cli: clitest_test: avoid calling t.FailNow outside main goroutine

johnstcn · johnstcn · commit 4ea0ed787567 · 2022-05-23T14:23:14.000+01:00
diff --git a/cli/clitest/clitest_test.go b/cli/clitest/clitest_test.go
@@ -1,7 +1,9 @@
 package clitest_test
 
 import (
+	"context"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/require"
 	"go.uber.org/goleak"
@@ -17,16 +19,20 @@ func TestMain(m *testing.M) {
 
 func TestCli(t *testing.T) {
 	t.Parallel()
+	ctx, cancelFunc := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancelFunc()
 	clitest.CreateTemplateVersionSource(t, nil)
 	client := coderdtest.New(t, nil)
 	cmd, config := clitest.New(t)
 	clitest.SetupConfig(t, client, config)
 	pty := ptytest.New(t)
 	cmd.SetIn(pty.Input())
 	cmd.SetOut(pty.Output())
+	errC := make(chan error)
 	go func() {
-		err := cmd.Execute()
-		require.NoError(t, err)
+		errC <- cmd.ExecuteContext(ctx)
 	}()
 	pty.ExpectMatch("coder")
+	cancelFunc()
+	require.NoError(t, <-errC)
 }
