WIP

mtojek · mtojek · commit 04fce6947778 · 2022-12-07T10:12:06.000+01:00
diff --git a/.github/workflows/coder.yaml b/.github/workflows/coder.yaml
@@ -340,7 +340,7 @@ jobs:
 
       - uses: actions/upload-artifact@v3
         with:
-          name: gotestsum debug (TestEvents)
+          name: gotestsum-debug-${{ matrix.os }}.json
           path: ./gotestsum.json
           retention-days: 7
 
@@ -407,7 +407,7 @@ jobs:
 
       - uses: actions/upload-artifact@v3
         with:
-          name: gotestsum debug (TestEvents)
+          name: gotestsum-debug-${{ matrix.os }}.json
           path: ./gotestsum.json
           retention-days: 7
 
diff --git a/pty/ptytest/ptytest.go b/pty/ptytest/ptytest.go
@@ -202,7 +202,11 @@ func logf(t *testing.T, name, format string, args ...interface{}) {
 func fatalf(t *testing.T, name, reason, format string, args ...interface{}) {
 	t.Helper()
 
-	t.Fatalf("%s: %s %s", name, reason, fmt.Sprintf(format, args...))
+	// Ensure the message is part of the normal log stream before
+	// failing the test.
+	logf(t, name, "%s: %s", reason, fmt.Sprintf(format, args...))
+
+	require.FailNowf(t, reason, format, args...)
 }
 
 // stdbuf is like a buffered stdout, it buffers writes until read.
