From 60c5d836be88812fd5c36ab579908bb41cbbd410 Mon Sep 17 00:00:00 2001
From: Mattias de Zalenski <zalenski@northvolt.com>
Date: Tue, 25 Apr 2023 04:54:10 +0200
Subject: [PATCH] Use --format-compact -plain to not use dotwriter

---
 testjson/compactformat.go | 13 +++++++++++--
 testjson/format.go        |  2 --
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/testjson/compactformat.go b/testjson/compactformat.go
index d79ea87d..b66e1acb 100644
--- a/testjson/compactformat.go
+++ b/testjson/compactformat.go
@@ -16,7 +16,7 @@ import (
 	"golang.org/x/term"
 )
 
-const CompactFormats = "relative, short, partial, partial-back, -dots"
+const CompactFormats = "relative, short, partial, partial-back, -dots, -plain"
 
 func CompactFormatUsage(out io.Writer, name string) {
 	fmt.Fprintf(out, `
@@ -26,6 +26,7 @@ Formats:
 	partial                  print newly entered path segments for each package
 	partial-back             partial with an indication when it backs out
 	-dots[N]                 print test dots summary after the package
+	-plain                   do not rewrite lines, print each package when finished
 
 `)
 }
@@ -47,6 +48,7 @@ type pkgLine struct {
 
 func shouldJoinPkgs(opts FormatOptions, lastPkg, pkg string) (join bool, commonPrefix string, backUp int) {
 	pkgNameFormat := dotFmtRe.ReplaceAllString(opts.CompactPkgNameFormat, "")
+	pkgNameFormat = strings.TrimSuffix(pkgNameFormat, "-plain")
 	switch pkgNameFormat {
 	case "relative":
 		return true, "", 0
@@ -67,6 +69,13 @@ func shouldJoinPkgs(opts FormatOptions, lastPkg, pkg string) (join bool, commonP
 }
 
 func pkgNameCompactFormat(out io.Writer, opts FormatOptions) eventFormatterFunc {
+	if strings.Contains(opts.CompactPkgNameFormat, "-plain") {
+		return pkgNameCompactFormatPlain(out, opts)
+	}
+	return pkgNameCompactFormatDotwriter(out, opts)
+}
+
+func pkgNameCompactFormatPlain(out io.Writer, opts FormatOptions) eventFormatterFunc {
 	buf := bufio.NewWriter(out)
 	pt := &PkgTracker{
 		opts: opts,
@@ -187,7 +196,7 @@ func noColorLen(s string) int {
 
 // ---
 
-func pkgNameCompactFormat2(out io.Writer, opts FormatOptions) eventFormatterFunc {
+func pkgNameCompactFormatDotwriter(out io.Writer, opts FormatOptions) eventFormatterFunc {
 	pt := &PkgTracker{
 		opts: opts,
 		pkgs: map[string]*pkgLine{},
diff --git a/testjson/format.go b/testjson/format.go
index 8603b4fe..386a4668 100644
--- a/testjson/format.go
+++ b/testjson/format.go
@@ -310,8 +310,6 @@ func NewEventFormatter(out io.Writer, format string, formatOpts FormatOptions) E
 		return pkgNameFormat(out, formatOpts)
 	case "pkgname-compact":
 		return pkgNameCompactFormat(out, formatOpts)
-	case "pkgname-compact2":
-		return pkgNameCompactFormat2(out, formatOpts)
 	default:
 		return nil
 	}