Merge "ref: Fix more tests that dial themselves, which doesn't work in the new rpc system."
diff --git a/examples/fortune/fortuned/impl_test.go b/examples/fortune/fortuned/impl_test.go
index 0c6048d..3ce7145 100644
--- a/examples/fortune/fortuned/impl_test.go
+++ b/examples/fortune/fortuned/impl_test.go
@@ -55,7 +55,7 @@
service := fortune.FortuneServer(impl)
name := ""
- ctx, server, err := v23.WithNewServer(ctx, name, service, authorizer)
+ _, server, err := v23.WithNewServer(ctx, name, service, authorizer)
if err != nil {
t.Errorf("Failure creating server: %v", err)
}
diff --git a/examples/rps/rpsbot/impl_test.go b/examples/rps/rpsbot/impl_test.go
index 2f8703a..558839a 100644
--- a/examples/rps/rpsbot/impl_test.go
+++ b/examples/rps/rpsbot/impl_test.go
@@ -36,7 +36,7 @@
if err != nil {
return fmt.Errorf("mounttablelib.NewMountTableDispatcher failed: %s", err)
}
- ctx, server, err := v23.WithNewDispatchingServer(ctx, "", mt, options.ServesMountTable(true))
+ _, server, err := v23.WithNewDispatchingServer(ctx, "", mt, options.ServesMountTable(true))
if err != nil {
return fmt.Errorf("root failed: %v", err)
}
@@ -53,7 +53,7 @@
ns.SetRoots(mtAddress)
rpsService := NewRPS(ctx)
names := []string{"rps/judge/test", "rps/player/test", "rps/scorekeeper/test"}
- ctx, server, err := v23.WithNewServer(ctx, names[0], rps.RockPaperScissorsServer(rpsService), nil)
+ _, server, err := v23.WithNewServer(ctx, names[0], rps.RockPaperScissorsServer(rpsService), nil)
if err != nil {
t.Fatalf("NewServer failed: %v", err)
}
diff --git a/lib/signals/signals_test.go b/lib/signals/signals_test.go
index b088e1b..e92abae 100644
--- a/lib/signals/signals_test.go
+++ b/lib/signals/signals_test.go
@@ -348,7 +348,7 @@
defer sh.Cleanup(os.Stderr, os.Stderr)
ch := make(chan string)
- ctx, server, err := v23.WithNewServer(ctx, "", device.ConfigServer(&configServer{ch}), securityflag.NewAuthorizerOrDie())
+ _, server, err := v23.WithNewServer(ctx, "", device.ConfigServer(&configServer{ch}), securityflag.NewAuthorizerOrDie())
if err != nil {
t.Fatalf("Got error: %v", err)
}
diff --git a/runtime/internal/naming/namespace/all_test.go b/runtime/internal/naming/namespace/all_test.go
index a9aef6f..b33c080 100644
--- a/runtime/internal/naming/namespace/all_test.go
+++ b/runtime/internal/naming/namespace/all_test.go
@@ -220,7 +220,7 @@
}
func run(t *testing.T, ctx *context.T, disp rpc.Dispatcher, mountPoint string, mt bool) *serverEntry {
- ctx, s, err := v23.WithNewDispatchingServer(ctx, mountPoint, disp, options.ServesMountTable(mt))
+ _, s, err := v23.WithNewDispatchingServer(ctx, mountPoint, disp, options.ServesMountTable(mt))
if err != nil {
boom(t, "r.NewServer: %s", err)
}
@@ -773,7 +773,7 @@
ns := v23.GetNamespace(ctx)
ns.SetRoots(root.name)
- ctx, server, err := v23.WithNewServer(ctx, "leaf", &leafObject{}, nil)
+ _, server, err := v23.WithNewServer(ctx, "leaf", &leafObject{}, nil)
if err != nil {
boom(t, "v23.WithNewServer: %s", err)
}
diff --git a/runtime/internal/rt/mgmt_test.go b/runtime/internal/rt/mgmt_test.go
index 97b0c55..b0b8103 100644
--- a/runtime/internal/rt/mgmt_test.go
+++ b/runtime/internal/rt/mgmt_test.go
@@ -277,7 +277,7 @@
ch := make(chan string)
service := device.ConfigServer(&configServer{ch})
authorizer := securityflag.NewAuthorizerOrDie()
- ctx, configServer, err := v23.WithNewServer(ctx, "", service, authorizer)
+ _, configServer, err := v23.WithNewServer(ctx, "", service, authorizer)
if err != nil {
t.Fatalf("Got error: %v", err)
}
diff --git a/services/application/applicationd/impl_test.go b/services/application/applicationd/impl_test.go
index 4f49d7f..770c20f 100644
--- a/services/application/applicationd/impl_test.go
+++ b/services/application/applicationd/impl_test.go
@@ -82,7 +82,7 @@
t.Fatalf("NewDispatcher() failed: %v", err)
}
- ctx, server, err := v23.WithNewDispatchingServer(ctx, "", dispatcher)
+ _, server, err := v23.WithNewDispatchingServer(ctx, "", dispatcher)
if err != nil {
t.Fatalf("NewServer(%v) failed: %v", dispatcher, err)
}
@@ -291,7 +291,7 @@
t.Fatalf("NewDispatcher() failed: %v", err)
}
- ctx, server, err := v23.WithNewDispatchingServer(ctx, "", dispatcher)
+ _, server, err := v23.WithNewDispatchingServer(ctx, "", dispatcher)
if err != nil {
t.Fatalf("Serve(%v) failed: %v", dispatcher, err)
}
@@ -328,7 +328,7 @@
t.Fatalf("NewDispatcher() failed: %v", err)
}
- ctx, server, err = v23.WithNewDispatchingServer(ctx, "", dispatcher)
+ _, server, err = v23.WithNewDispatchingServer(ctx, "", dispatcher)
if err != nil {
t.Fatalf("NewServer(%v) failed: %v", dispatcher, err)
}
@@ -355,7 +355,7 @@
t.Fatalf("NewDispatcher() failed: %v", err)
}
- ctx, server, err := v23.WithNewDispatchingServer(ctx, "", dispatcher)
+ _, server, err := v23.WithNewDispatchingServer(ctx, "", dispatcher)
if err != nil {
t.Fatalf("NewServer(%v) failed: %v", dispatcher, err)
}
diff --git a/services/binary/binary/impl_test.go b/services/binary/binary/impl_test.go
index 93f51be..13f4c76 100644
--- a/services/binary/binary/impl_test.go
+++ b/services/binary/binary/impl_test.go
@@ -104,7 +104,7 @@
ctx, shutdown := test.V23Init()
defer shutdown()
- ctx, server, err := v23.WithNewDispatchingServer(ctx, "", NewDispatcher())
+ _, server, err := v23.WithNewDispatchingServer(ctx, "", NewDispatcher())
if err != nil {
t.Fatalf("NewServer failed: %v", err)
}
diff --git a/services/build/buildd/impl_test.go b/services/build/buildd/impl_test.go
index 56c4620..95f98e1 100644
--- a/services/build/buildd/impl_test.go
+++ b/services/build/buildd/impl_test.go
@@ -68,7 +68,7 @@
gobin, goroot := findGoBinary(t, "go")
service := build.BuilderServer(NewBuilderService(gobin, goroot))
unpublished := ""
- ctx, server, err := v23.WithNewServer(ctx, unpublished, service, nil)
+ _, server, err := v23.WithNewServer(ctx, unpublished, service, nil)
if err != nil {
t.Fatalf("NewServer() failed: %v", err)
}
diff --git a/services/internal/vtracelib/vtrace_test.go b/services/internal/vtracelib/vtrace_test.go
index a932add..31a853c 100644
--- a/services/internal/vtracelib/vtrace_test.go
+++ b/services/internal/vtracelib/vtrace_test.go
@@ -23,7 +23,7 @@
ctx, shutdown := test.V23Init()
defer shutdown()
- ctx, server, err := v23.WithNewServer(ctx, "", vtracelib.NewVtraceService(), nil)
+ _, server, err := v23.WithNewServer(ctx, "", vtracelib.NewVtraceService(), nil)
if err != nil {
t.Fatalf("Could not create server: %s", err)
}
