Merge "veyron/services/mgmt/suidhelper: Pass std FDs to the child"
diff --git a/runtimes/google/ipc/client_test.go b/runtimes/google/ipc/client_test.go
index e63551c..5be7bc2 100644
--- a/runtimes/google/ipc/client_test.go
+++ b/runtimes/google/ipc/client_test.go
@@ -204,7 +204,7 @@
_, file, line, _ := runtime.Caller(1)
loc := fmt.Sprintf("%s:%d", filepath.Base(file), line)
if !verror.Is(err, verr.ID) {
- if _, ok := err.(verror.E); !ok {
+ if _, ok := err.(verror.Standard); !ok {
t.Fatalf("%s: err %v not a verror", loc, err)
}
stack := ""
diff --git a/runtimes/google/ipc/full_test.go b/runtimes/google/ipc/full_test.go
index 5aecc6d..61fdf72 100644
--- a/runtimes/google/ipc/full_test.go
+++ b/runtimes/google/ipc/full_test.go
@@ -1074,11 +1074,11 @@
call := func() error {
call, err := b.client.StartCall(testContext(), "mountpoint/server/aclAuth", "Echo", []interface{}{"batman"})
if err != nil {
- return err.(verror.E) //fmt.Errorf("client.StartCall failed: %v", err)
+ return err //fmt.Errorf("client.StartCall failed: %v", err)
}
var got string
if err := call.Finish(&got); err != nil {
- return err.(verror.E) //fmt.Errorf("client.Finish failed: %v", err)
+ return err //fmt.Errorf("client.Finish failed: %v", err)
}
if want := `method:"Echo",suffix:"aclAuth",arg:"batman"`; got != want {
return verror.Convert(verror.BadArg, nil, fmt.Errorf("Got [%v] want [%v]", got, want))
diff --git a/runtimes/google/naming/namespace/namespace.go b/runtimes/google/naming/namespace/namespace.go
index 21de030..c870b88 100644
--- a/runtimes/google/naming/namespace/namespace.go
+++ b/runtimes/google/naming/namespace/namespace.go
@@ -43,7 +43,7 @@
return true
}
-func badRoots(roots []string) verror.E {
+func badRoots(roots []string) error {
return verror.BadArgf("At least one root is not a rooted name: %q", roots)
}
