Restore old format for dots

Attempt to fix dots-v2 by adding empty newlines

internal/dotwriter/writer.go

@@ -29,7 +29,7 @@ func (w *Writer) Flush() error {
 	if w.buf.Len() == 0 {
 		return nil
 	}
-	w.clearLines()
+	w.clearLines(w.lineCount)
 	w.lineCount = bytes.Count(w.buf.Bytes(), []byte{'\n'})
 	_, err := w.out.Write(w.buf.Bytes())
 	w.buf.Reset()

internal/dotwriter/writer_posix.go

@@ -10,6 +10,6 @@ import (
 // clear the line and move the cursor up
 var clear = fmt.Sprintf("%c[%dA%c[2K", ESC, 1, ESC)
 
-func (w *Writer) clearLines() {
-	_, _ = fmt.Fprint(w.out, strings.Repeat(clear, w.lineCount))
+func (w *Writer) clearLines(count int) {
+	_, _ = fmt.Fprint(w.out, strings.Repeat(clear, count))
 }

internal/dotwriter/writer_windows.go

@@ -52,20 +52,20 @@ type fdWriter interface {
 	Fd() uintptr
 }
 
-func (w *Writer) clearLines() {
+func (w *Writer) clearLines(count int) {
 	f, ok := w.out.(fdWriter)
 	if ok && !isatty.IsTerminal(f.Fd()) {
 		ok = false
 	}
 	if !ok {
-		_, _ = fmt.Fprint(w.out, strings.Repeat(clear, w.lineCount))
+		_, _ = fmt.Fprint(w.out, strings.Repeat(clear, count))
 		return
 	}
 	fd := f.Fd()
 	var csbi consoleScreenBufferInfo
 	_, _, _ = procGetConsoleScreenBufferInfo.Call(fd, uintptr(unsafe.Pointer(&csbi)))
 
-	for i := 0; i < w.lineCount; i++ {
+	for i := 0; i < count; i++ {
 		// move the cursor up
 		csbi.cursorPosition.y--
 		_, _, _ = procSetConsoleCursorPosition.Call(fd, uintptr(*(*int32)(unsafe.Pointer(&csbi.cursorPosition))))

main.go

@@ -66,7 +66,7 @@ Flags:
 		fmt.Fprint(os.Stderr, `
 Formats:
     dots                    print a character for each test
-    dots-compact            dots, without the newlines
+    dots-v2                 experimental dots format, one package per line
     pkgname                 print a line for each package
     pkgname-and-test-fails  print a line for each package and failed test output
     testname                print a line for each test and package

testjson/dotformat.go

@@ -96,6 +96,9 @@ func (d *dotFormatter) Format(event TestEvent, exec *Execution) error {
 		return nil
 	}
 
+	// Add an empty header to work around incorrect line counting
+	fmt.Fprint(d.writer, "\n\n")
+
 	sort.Slice(d.order, d.orderByLastUpdated)
 	for _, pkg := range d.order {
 		line := d.pkgs[pkg]

testjson/format.go

@@ -198,10 +198,10 @@ func NewEventFormatter(out io.Writer, format string) EventFormatter {
 		return &formatAdapter{out, standardVerboseFormat}
 	case "standard-quiet":
 		return &formatAdapter{out, standardQuietFormat}
-	case "dots":
-		return newDotFormatter(out)
-	case "dots-compact":
+	case "dots", "dots-v1":
 		return &formatAdapter{out, dotsFormatV1}
+	case "dots-v2":
+		return newDotFormatter(out)
 	case "testname", "short-verbose":
 		return &formatAdapter{out, shortVerboseFormat}
 	case "pkgname", "short":