.

go/internal/xtracing/tracetest/example_test.go

@@ -106,7 +106,7 @@ func TestTracetestExample(t *testing.T) {
 		}()
 
 		// assert that events come as expected
-		t.Expect("t3", eventHi("T2·C"))
+		t.Expect("t2", eventHello("T2·D"))
 		t.Expect("t1", eventHi("T1·A"))
 		t.Expect("t1", eventHello("T1·B"))
 

go/internal/xtracing/tracetest/tracetest.go

@@ -92,8 +92,6 @@ import (
 	"time"
 
 	"github.com/kylelemons/godebug/pretty"
-
-//	"lab.nexedi.com/kirr/go123/xruntime"
 )
 
 var (
@@ -622,7 +620,7 @@ func (t *T) expect1(stream string, eventExpect interface{}) *Msg {
 
 	if !reflect.DeepEqual(revent.Interface(), reventExpect.Interface()) {
 		t.queuenak(msg, "unexpected event data")
-		t.Fatalf("%s: expect: %s:\nwant: %v\nhave: %v\ndiff:\n%s\n",
+		t.Fatalf("%s: expect: %s:\nwant: %v\nhave: %v\ndiff:\n%s\n\n",
 			stream,
 			reventExpect.Type(), reventExpect, revent,
 			pretty.Compare(reventExpect.Interface(), revent.Interface()))
@@ -759,6 +757,7 @@ func (t *T) FailNow() {
 	t.streamTab = nil
 	t.streamTabMu.Unlock()
 
+	// print details about pending events and all streams
 	type sendInfo struct{ch Chan; msg *Msg}
 	var sendv  []sendInfo // sends are pending here
 	var quietv []Chan     // this channels are quiet
@@ -783,23 +782,18 @@ func (t *T) FailNow() {
 		}
 	}
 
-	bad := ""
-	if len(sendv) == 0 {
-		bad += fmt.Sprintf("no pending events\n")
-	} else {
-		bad += fmt.Sprintf("%d pending event(s):\n", len(sendv))
-		for _, __ := range sendv {
-			bad += fmt.Sprintf("%s\t<- %T %v\n", __.ch.name(), __.msg.Event, __.msg.Event)
-		}
+	pending := fmt.Sprintf("#streams: %d,  #(pending events): %d\n", len(streams), len(sendv))
+	for _, __ := range sendv {
+		pending += fmt.Sprintf("%s\t<- %T %v\n", __.ch.name(), __.msg.Event, __.msg.Event)
 	}
 	for _, ch := range quietv {
-		bad += fmt.Sprintf("# %s\n", ch.name())
+		pending += fmt.Sprintf("# %s\n", ch.name())
 	}
 
 	// log the details and nak senders that we received from.
 	// nak them only after details printout, so that our text comes first,
 	// and their "panics" don't get intermixed with it.
-	t.Log(bad)
+	t.Log(pending)
 	for _, __ := range t.nakq {
 		__.msg.nak(__.why)
 	}