rerun: add done line, and only warn on exit !{0,1}

gotestyourself · Jun 12, 2020 · bb6a8a5 · bb6a8a5
1 parent e8026de
commit bb6a8a5
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 2 deletions.
diff --git a/do b/do
@@ -8,6 +8,11 @@ binary() {
 }
 
 update-golden() {
+    _update-golden
+    GOLANG_VERSION=1.13-alpine ./do shell bash -c 'go build; PATH=$PATH:. ./do _update-golden'
+}
+
+_update-golden() {
     gotestsum -- . ./testjson ./internal/junitxml ./cmd/tool/slowest -test.update-golden
 }
 

diff --git a/rerunfails.go b/rerunfails.go
@@ -41,6 +41,9 @@ func rerunFailed(ctx context.Context, opts *options, scanConfig testjson.ScanCon
 			return fmt.Errorf("re-run cancelled because previous run had errors")
 		}
 
+		testjson.PrintSummary(opts.stdout, scanConfig.Execution, testjson.SummarizeNone)
+		opts.stdout.Write([]byte("\n")) // nolint: errcheck
+
 		nextRec := newFailureRecorder(scanConfig.Handler)
 		for pkg, testCases := range rec.pkgFailures {
 			rerun := rerunOpts{
@@ -62,8 +65,11 @@ func rerunFailed(ctx context.Context, opts *options, scanConfig testjson.ScanCon
 				return err
 			}
 			lastErr = goTestProc.cmd.Wait()
-			log.Warnf("go test exit code: %v", lastErr)
-			// TODO: will 'go test' exit with 2 if it panics? possibly error on that
+			// 0 and 1 are expected.
+			if ExitCodeWithDefault(lastErr) > 1 {
+				log.Warnf("unexpected go test exit code: %v", lastErr)
+				// TODO: will 'go test' exit with 2 if it panics? maybe return err here.
+			}
 			rec = nextRec
 		}
 	}

diff --git a/testdata/e2e/expected/TestE2E_RerunFails/reruns_continues_to_fail b/testdata/e2e/expected/TestE2E_RerunFails/reruns_continues_to_fail
@@ -17,6 +17,9 @@ FAIL testdata/e2e/flaky.TestFailsOften
 PASS testdata/e2e/flaky.TestFailsOftenDoesNotPrefixMatch
 PASS testdata/e2e/flaky.TestFailsSometimesDoesNotPrefixMatch
 FAIL testdata/e2e/flaky
+
+DONE 6 tests, 3 failures
+
 PASS testdata/e2e/flaky.TestFailsRarely
 === RUN   TestFailsSometimes
 SEED:  1
@@ -29,6 +32,9 @@ SEED:  1
     flaky_test.go:65: not this time
 FAIL testdata/e2e/flaky.TestFailsOften
 FAIL testdata/e2e/flaky
+
+DONE 9 tests, 5 failures
+
 PASS testdata/e2e/flaky.TestFailsSometimes
 === RUN   TestFailsOften
 SEED:  2

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
@@ -17,6 +17,9 @@ FAIL testdata/e2e/flaky.TestFailsOften
 PASS testdata/e2e/flaky.TestFailsOftenDoesNotPrefixMatch
 PASS testdata/e2e/flaky.TestFailsSometimesDoesNotPrefixMatch
 FAIL testdata/e2e/flaky
+
+DONE 6 tests, 3 failures
+
 PASS testdata/e2e/flaky.TestFailsRarely
 === RUN   TestFailsSometimes
 SEED:  1
@@ -29,6 +32,9 @@ SEED:  1
 --- FAIL: TestFailsOften
 FAIL testdata/e2e/flaky.TestFailsOften
 FAIL testdata/e2e/flaky
+
+DONE 9 tests, 5 failures
+
 PASS testdata/e2e/flaky.TestFailsSometimes
 === RUN   TestFailsOften
 SEED:  2

diff --git a/testdata/e2e/expected/TestE2E_RerunFails/reruns_until_success b/testdata/e2e/expected/TestE2E_RerunFails/reruns_until_success
@@ -17,6 +17,9 @@ FAIL testdata/e2e/flaky.TestFailsOften
 PASS testdata/e2e/flaky.TestFailsOftenDoesNotPrefixMatch
 PASS testdata/e2e/flaky.TestFailsSometimesDoesNotPrefixMatch
 FAIL testdata/e2e/flaky
+
+DONE 6 tests, 3 failures
+
 PASS testdata/e2e/flaky.TestFailsRarely
 === RUN   TestFailsSometimes
 SEED:  1
@@ -29,19 +32,28 @@ SEED:  1
     flaky_test.go:65: not this time
 FAIL testdata/e2e/flaky.TestFailsOften
 FAIL testdata/e2e/flaky
+
+DONE 9 tests, 5 failures
+
 PASS testdata/e2e/flaky.TestFailsSometimes
 === RUN   TestFailsOften
 SEED:  2
 --- FAIL: TestFailsOften
     flaky_test.go:65: not this time
 FAIL testdata/e2e/flaky.TestFailsOften
 FAIL testdata/e2e/flaky
+
+DONE 11 tests, 6 failures
+
 === RUN   TestFailsOften
 SEED:  3
 --- FAIL: TestFailsOften
     flaky_test.go:65: not this time
 FAIL testdata/e2e/flaky.TestFailsOften
 FAIL testdata/e2e/flaky
+
+DONE 12 tests, 7 failures
+
 PASS testdata/e2e/flaky.TestFailsOften
 PASS testdata/e2e/flaky
 

diff --git a/testdata/e2e/expected/TestE2E_RerunFails/reruns_until_success-go1.14 b/testdata/e2e/expected/TestE2E_RerunFails/reruns_until_success-go1.14
@@ -17,6 +17,9 @@ FAIL testdata/e2e/flaky.TestFailsOften
 PASS testdata/e2e/flaky.TestFailsOftenDoesNotPrefixMatch
 PASS testdata/e2e/flaky.TestFailsSometimesDoesNotPrefixMatch
 FAIL testdata/e2e/flaky
+
+DONE 6 tests, 3 failures
+
 PASS testdata/e2e/flaky.TestFailsRarely
 === RUN   TestFailsSometimes
 SEED:  1
@@ -29,19 +32,28 @@ SEED:  1
 --- FAIL: TestFailsOften
 FAIL testdata/e2e/flaky.TestFailsOften
 FAIL testdata/e2e/flaky
+
+DONE 9 tests, 5 failures
+
 PASS testdata/e2e/flaky.TestFailsSometimes
 === RUN   TestFailsOften
 SEED:  2
     TestFailsOften: flaky_test.go:65: not this time
 --- FAIL: TestFailsOften
 FAIL testdata/e2e/flaky.TestFailsOften
 FAIL testdata/e2e/flaky
+
+DONE 11 tests, 6 failures
+
 === RUN   TestFailsOften
 SEED:  3
     TestFailsOften: flaky_test.go:65: not this time
 --- FAIL: TestFailsOften
 FAIL testdata/e2e/flaky.TestFailsOften
 FAIL testdata/e2e/flaky
+
+DONE 12 tests, 7 failures
+
 PASS testdata/e2e/flaky.TestFailsOften
 PASS testdata/e2e/flaky