Merge branch 'master' into sm-channels

_testdata/cmd/echosleep.go

@@ -12,6 +12,6 @@ func main() {
 
 	for i := 0; i < *n; i++ {
 		fmt.Println("foo")
-		time.Sleep(time.Duration(i) * 100 * time.Millisecond)
+		time.Sleep(time.Duration(i) * 250 * time.Millisecond)
 	}
 }

circle.yml

@@ -24,7 +24,7 @@ test:
       cd $RD && \
         echo 'mode: atomic' > coverage.txt && \
         go list ./... | grep -v "/vendor/" | \
-          xargs -n1 -I% sh -c 'set -e; go test -covermode=atomic -coverprofile=coverage.out -v % ; tail -n +2 coverage.out >> coverage.txt' && \
+          xargs -n1 -I% sh -c 'set -e; go test -covermode=atomic -coverprofile=coverage.out % ; tail -n +2 coverage.out >> coverage.txt' && \
         rm coverage.out
     - cd $RD && go build example.go
     - cd $RD && bash <(curl -s https://codecov.io/bash)

cmd_test.go

@@ -12,7 +12,7 @@ import (
 func mkTestCmd(iterations int) *monitoredCmd {
 	return newMonitoredCmd(
 		exec.Command("./echosleep", "-n", fmt.Sprint(iterations)),
-		200*time.Millisecond,
+		500*time.Millisecond,
 	)
 }
 

metrics.go

@@ -62,11 +62,10 @@ func (m *metrics) dump(l *log.Logger) {
 		fmt.Fprintf(w, "\t%s:\t%v\t\n", nd.n, nd.d)
 	}
 	fmt.Fprintf(w, "\n\tTOTAL:\t%v\t\n", tot)
-
-	l.Println("\nSolver wall times by segment:")
 	w.Flush()
-	fmt.Println((&buf).String())
 
+	l.Println("\nSolver wall times by segment:")
+	l.Println((&buf).String())
 }
 
 type ndpair struct {

solve_test.go

@@ -7,12 +7,12 @@ import (
 	"io/ioutil"
 	"log"
 	"math/rand"
-	"os"
 	"reflect"
 	"sort"
 	"strconv"
 	"strings"
 	"testing"
+	"unicode"
 
 	"github.com/sdboyer/gps/internal"
 	"github.com/sdboyer/gps/pkgtree"
@@ -52,13 +52,31 @@ func overrideIsStdLib() {
 	}
 }
 
-var stderrlog = log.New(os.Stderr, "", 0)
+type testlogger struct {
+	*testing.T
+}
+
+func (t testlogger) Write(b []byte) (n int, err error) {
+	str := string(b)
+	if len(str) == 0 {
+		return 0, nil
+	}
 
-func fixSolve(params SolveParameters, sm SourceManager) (Solution, error) {
-	if testing.Verbose() {
-		params.Trace = true
-		params.TraceLogger = stderrlog
+	for _, part := range strings.Split(str, "\n") {
+		str := strings.TrimRightFunc(part, unicode.IsSpace)
+		if len(str) != 0 {
+			t.T.Log(str)
+		}
 	}
+	return len(b), err
+}
+
+func fixSolve(params SolveParameters, sm SourceManager, t *testing.T) (Solution, error) {
+	// Trace unconditionally; by passing the trace through t.Log(), the testing
+	// system will decide whether or not to actually show the output (based on
+	// -v, or selectively on test failure).
+	params.Trace = true
+	params.TraceLogger = log.New(testlogger{T: t}, "", 0)
 
 	s, err := Prepare(params, sm)
 	if err != nil {
@@ -111,7 +129,7 @@ func solveBasicsAndCheck(fix basicFixture, t *testing.T) (res Solution, err erro
 		params.Lock = fix.l
 	}
 
-	res, err = fixSolve(params, sm)
+	res, err = fixSolve(params, sm, t)
 
 	return fixtureSolveSimpleChecks(fix, res, err, t)
 }
@@ -142,9 +160,6 @@ func TestBimodalSolves(t *testing.T) {
 }
 
 func solveBimodalAndCheck(fix bimodalFixture, t *testing.T) (res Solution, err error) {
-	if testing.Verbose() {
-		stderrlog.Printf("[[fixture %q]]", fix.n)
-	}
 	sm := newbmSM(fix)
 
 	params := SolveParameters{
@@ -161,7 +176,7 @@ func solveBimodalAndCheck(fix bimodalFixture, t *testing.T) (res Solution, err e
 		params.Lock = fix.l
 	}
 
-	res, err = fixSolve(params, sm)
+	res, err = fixSolve(params, sm, t)
 
 	return fixtureSolveSimpleChecks(fix, res, err, t)
 }
@@ -289,7 +304,7 @@ func TestRootLockNoVersionPairMatching(t *testing.T) {
 		ProjectAnalyzer: naiveAnalyzer{},
 	}
 
-	res, err := fixSolve(params, sm)
+	res, err := fixSolve(params, sm, t)
 
 	fixtureSolveSimpleChecks(fix, res, err, t)
 }