tests: Log output per-executor

task_test.go

@@ -1163,8 +1163,6 @@ func TestIncludesRemote(t *testing.T) {
 			t.Setenv("FIRST_REMOTE_URL", tc.firstRemote)
 			t.Setenv("SECOND_REMOTE_URL", tc.secondRemote)
 
-			var buff SyncBuffer
-
 			executors := []struct {
 				name     string
 				executor *task.Executor
@@ -1173,12 +1171,9 @@ func TestIncludesRemote(t *testing.T) {
 					name: "online, always download",
 					executor: &task.Executor{
 						Dir:        dir,
-						Stdout:     &buff,
-						Stderr:     &buff,
 						Entrypoint: tc.rootTaskfile,
 						Timeout:    time.Minute,
 						Insecure:   true,
-						Logger:     &logger.Logger{Stdout: &buff, Stderr: &buff, Verbose: true},
 						Verbose:    true,
 
 						// Without caching
@@ -1191,12 +1186,10 @@ func TestIncludesRemote(t *testing.T) {
 					name: "offline, use-cache",
 					executor: &task.Executor{
 						Dir:        dir,
-						Stdout:     &buff,
-						Stderr:     &buff,
 						Entrypoint: tc.rootTaskfile,
 						Timeout:    time.Minute,
 						Insecure:   true,
-						Logger:     &logger.Logger{Stdout: &buff, Stderr: &buff, Verbose: true},
+						Verbose:    true,
 
 						// With caching
 						AssumeYes: false,
@@ -1208,6 +1201,13 @@ func TestIncludesRemote(t *testing.T) {
 
 			for j, e := range executors {
 				t.Run(fmt.Sprint(j), func(t *testing.T) {
+					var buff SyncBuffer
+					defer func() { t.Log("\noutput:\n", buff.buf.String()) }()
+
+					e.executor.Stderr = &buff
+					e.executor.Stdout = &buff
+					e.executor.Logger = &logger.Logger{Stderr: &buff, Stdout: &buff, Verbose: true}
+
 					require.NoError(t, e.executor.Setup())
 
 					for k, task := range tasks {
@@ -1236,8 +1236,6 @@ func TestIncludesRemote(t *testing.T) {
 					}
 				})
 			}
-
-			t.Log("\noutput:\n", buff.buf.String())
 		})
 	}
 }