Merge "veyron/tools/mgmt/device: rename node->device, cl 4 of N (go/vissue/496)"
diff --git a/runtimes/google/ipc/debug_test.go b/runtimes/google/ipc/debug_test.go
index d5bce8a..8b2cacf 100644
--- a/runtimes/google/ipc/debug_test.go
+++ b/runtimes/google/ipc/debug_test.go
@@ -1,6 +1,7 @@
package ipc
import (
+ "io"
"reflect"
"sort"
"testing"
@@ -102,22 +103,25 @@
addr := naming.JoinAddressName(ep.String(), tc.name)
call, err := client.StartCall(ctx, addr, ipc.GlobMethod, []interface{}{tc.pattern}, options.NoResolve(true))
if err != nil {
- t.Fatalf("client.StartCall failed: %v", err)
+ t.Fatalf("client.StartCall failed for %q: %v", tc.name, err)
}
results := []string{}
for {
var me naming.VDLMountEntry
if err := call.Recv(&me); err != nil {
+ if err != io.EOF {
+ t.Fatalf("Recv failed for %q: %v. Results received thus far: %q", tc.name, err, results)
+ }
break
}
results = append(results, me.Name)
}
if ferr := call.Finish(&err); ferr != nil {
- t.Fatalf("call.Finish failed: %v", ferr)
+ t.Fatalf("call.Finish failed for %q: %v", tc.name, ferr)
}
sort.Strings(results)
if !reflect.DeepEqual(tc.expected, results) {
- t.Errorf("unexpected results. Got %v, want %v", results, tc.expected)
+ t.Errorf("unexpected results for %q. Got %v, want %v", tc.name, results, tc.expected)
}
}
}
