Include run count in DONe line

gotestyourself · Jun 20, 2020 · a78bf96 · a78bf96
1 parent 83c209d
commit a78bf96
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 23 deletions.
diff --git a/testdata/e2e/expected/TestE2E_RerunFails/reruns_continues_to_fail b/testdata/e2e/expected/TestE2E_RerunFails/reruns_continues_to_fail
@@ -33,7 +33,7 @@ SEED:  1
 FAIL testdata/e2e/flaky.TestFailsOften (re-run 1)
 FAIL testdata/e2e/flaky
 
-DONE 9 tests, 5 failures
+DONE 2 runs, 9 tests, 5 failures
 
 PASS testdata/e2e/flaky.TestFailsSometimes (re-run 2)
 === RUN   TestFailsOften
@@ -69,4 +69,4 @@ SEED:  2
     flaky_test.go:65: not this time
 
 
-DONE 11 tests, 6 failures
+DONE 3 runs, 11 tests, 6 failures
diff --git a/testdata/e2e/expected/TestE2E_RerunFails/reruns_continues_to_fail-go1.14 b/testdata/e2e/expected/TestE2E_RerunFails/reruns_continues_to_fail-go1.14
@@ -33,7 +33,7 @@ SEED:  1
 FAIL testdata/e2e/flaky.TestFailsOften (re-run 1)
 FAIL testdata/e2e/flaky
 
-DONE 9 tests, 5 failures
+DONE 2 runs, 9 tests, 5 failures
 
 PASS testdata/e2e/flaky.TestFailsSometimes (re-run 2)
 === RUN   TestFailsOften
@@ -69,4 +69,4 @@ SEED:  2
     TestFailsOften: flaky_test.go:65: not this time
 
 
-DONE 11 tests, 6 failures
+DONE 3 runs, 11 tests, 6 failures
diff --git a/testdata/e2e/expected/TestE2E_RerunFails/reruns_until_success b/testdata/e2e/expected/TestE2E_RerunFails/reruns_until_success
@@ -33,7 +33,7 @@ SEED:  1
 FAIL testdata/e2e/flaky.TestFailsOften (re-run 1)
 FAIL testdata/e2e/flaky
 
-DONE 9 tests, 5 failures
+DONE 2 runs, 9 tests, 5 failures
 
 PASS testdata/e2e/flaky.TestFailsSometimes (re-run 2)
 === RUN   TestFailsOften
@@ -43,7 +43,7 @@ SEED:  2
 FAIL testdata/e2e/flaky.TestFailsOften (re-run 2)
 FAIL testdata/e2e/flaky
 
-DONE 11 tests, 6 failures
+DONE 3 runs, 11 tests, 6 failures
 
 === RUN   TestFailsOften
 SEED:  3
@@ -52,7 +52,7 @@ SEED:  3
 FAIL testdata/e2e/flaky.TestFailsOften (re-run 3)
 FAIL testdata/e2e/flaky
 
-DONE 12 tests, 7 failures
+DONE 4 runs, 12 tests, 7 failures
 
 PASS testdata/e2e/flaky.TestFailsOften (re-run 4)
 PASS testdata/e2e/flaky
@@ -87,4 +87,4 @@ SEED:  3
     flaky_test.go:65: not this time
 
 
-DONE 13 tests, 7 failures
+DONE 5 runs, 13 tests, 7 failures
diff --git a/testdata/e2e/expected/TestE2E_RerunFails/reruns_until_success-go1.14 b/testdata/e2e/expected/TestE2E_RerunFails/reruns_until_success-go1.14
@@ -33,7 +33,7 @@ SEED:  1
 FAIL testdata/e2e/flaky.TestFailsOften (re-run 1)
 FAIL testdata/e2e/flaky
 
-DONE 9 tests, 5 failures
+DONE 2 runs, 9 tests, 5 failures
 
 PASS testdata/e2e/flaky.TestFailsSometimes (re-run 2)
 === RUN   TestFailsOften
@@ -43,7 +43,7 @@ SEED:  2
 FAIL testdata/e2e/flaky.TestFailsOften (re-run 2)
 FAIL testdata/e2e/flaky
 
-DONE 11 tests, 6 failures
+DONE 3 runs, 11 tests, 6 failures
 
 === RUN   TestFailsOften
 SEED:  3
@@ -52,7 +52,7 @@ SEED:  3
 FAIL testdata/e2e/flaky.TestFailsOften (re-run 3)
 FAIL testdata/e2e/flaky
 
-DONE 12 tests, 7 failures
+DONE 4 runs, 12 tests, 7 failures
 
 PASS testdata/e2e/flaky.TestFailsOften (re-run 4)
 PASS testdata/e2e/flaky
@@ -87,4 +87,4 @@ SEED:  3
     TestFailsOften: flaky_test.go:65: not this time
 
 
-DONE 13 tests, 7 failures
+DONE 5 runs, 13 tests, 7 failures
diff --git a/testjson/execution.go b/testjson/execution.go
@@ -250,10 +250,11 @@ func newPackage() *Package {
 
 // Execution of one or more test packages
 type Execution struct {
-	started  time.Time
-	packages map[string]*Package
-	errors   []string
-	done     bool
+	started   time.Time
+	packages  map[string]*Package
+	errors    []string
+	done      bool
+	lastRunID int
 }
 
 func (e *Execution) add(event TestEvent) {
@@ -508,6 +509,9 @@ func ScanTestOutput(config ScanConfig) (*Execution, error) {
 	if execution == nil {
 		execution = newExecution()
 	}
+	execution.done = false
+	execution.lastRunID = config.RunID
+
 	var group errgroup.Group
 	group.Go(func() error {
 		return readStdout(config, execution)

diff --git a/testjson/summary.go b/testjson/summary.go
@@ -82,7 +82,7 @@ func PrintSummary(out io.Writer, execution *Execution, opts Summary) {
 	}
 
 	fmt.Fprintf(out, "\n%s %d tests%s%s%s in %s\n",
-		formatExecStatus(execution.done),
+		formatExecStatus(execution),
 		execution.Total(),
 		formatTestCount(len(execution.Skipped()), "skipped", ""),
 		formatTestCount(len(execution.Failed()), "failure", "s"),
@@ -101,12 +101,15 @@ func formatTestCount(count int, category string, pluralize string) string {
 	return fmt.Sprintf(", %d %s", count, category)
 }
 
-// TODO: maybe color this?
-func formatExecStatus(done bool) string {
-	if done {
-		return "DONE"
+func formatExecStatus(exec *Execution) string {
+	if !exec.done {
+		return ""
+	}
+	var runs string
+	if exec.lastRunID > 0 {
+		runs = fmt.Sprintf(" %d runs,", exec.lastRunID+1)
 	}
-	return ""
+	return "DONE" + runs
 }
 
 // FormatDurationAsSeconds formats a time.Duration as a float with an s suffix.

diff --git a/testjson/testdata/summary-with-run-id.out b/testjson/testdata/summary-with-run-id.out
@@ -32,4 +32,4 @@ this is stderr
 === FAIL: github.com/gotestyourself/gotestyourself/testjson/internal/stub TestNestedWithFailure (re-run 7) (0.00s)
 
 
-DONE 46 tests, 4 skipped, 5 failures in 0.000s
+DONE 8 runs, 46 tests, 4 skipped, 5 failures in 0.000s