Move console cleanup to shared place

bryphe-coder · bryphe-coder · commit e76ad95024db · 2022-02-14T21:48:01.000Z
diff --git a/cli/clitest/clitest.go b/cli/clitest/clitest.go
@@ -75,6 +75,9 @@ func NewConsole(t *testing.T, cmd *cobra.Command) *expect.Console {
 
 	console, err := expect.NewConsole(expect.WithStdout(writer))
 	require.NoError(t, err)
+	t.Cleanup(func() {
+		console.Close()
+	})
 	cmd.SetIn(console.InTty())
 	cmd.SetOut(console.OutTty())
 	return console
diff --git a/cli/clitest/clitest_test.go b/cli/clitest/clitest_test.go
@@ -20,9 +20,6 @@ func TestCli(t *testing.T) {
 	cmd, config := clitest.New(t)
 	clitest.SetupConfig(t, client, config)
 	console := clitest.NewConsole(t, cmd)
-	t.Cleanup(func () {
-		console.Close()
-	})
 	go func() {
 		err := cmd.Execute()
 		require.NoError(t, err)
