Only use groups for test cases with output.

gotestyourself · Aug 25, 2023 · 70249b4 · 70249b4
1 parent 10f00c8
commit 70249b4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/.project/golangci-lint.yml b/.project/golangci-lint.yml
@@ -31,7 +31,6 @@ linters:
     - deadcode
     - depguard
     - errcheck
-    - gocognit
     - goconst
     - gofmt
     - goimports

diff --git a/testjson/format.go b/testjson/format.go
@@ -346,13 +346,19 @@ func githubActionsFormat(out io.Writer) eventFormatterFunc {
 
 		// test case end event
 		if event.Test != "" && event.Action.IsTerminal() {
-			buf.WriteString("::group::")
+			if len(output[key]) > 0 {
+				buf.WriteString("::group::")
+			} else {
+				buf.WriteString("  ")
+			}
 			testNameFormatTestEvent(buf, event)
 
 			for _, item := range output[key] {
 				buf.WriteString(item)
 			}
-			buf.WriteString("\n::endgroup::\n")
+			if len(output[key]) > 0 {
+				buf.WriteString("\n::endgroup::\n")
+			}
 			delete(output, key)
 			return buf.Flush()
 		}

diff --git a/testjson/summary.go b/testjson/summary.go
@@ -222,5 +222,6 @@ func isFramingLine(line string, testName string) bool {
 		strings.HasPrefix(line, "=== PAUSE Test") ||
 		strings.HasPrefix(line, "=== CONT  Test") ||
 		strings.HasPrefix(line, "--- FAIL: "+testName+" ") ||
-		strings.HasPrefix(line, "--- SKIP: "+testName+" ")
+		strings.HasPrefix(line, "--- SKIP: "+testName+" ") ||
+		strings.HasPrefix(line, "--- PASS: "+testName+" ")
 }