"wspr": Make go-tests pass under agent
Update w.r.t CL https://vanadium-review.googlesource.com/#/c/2608/
Change-Id: I02939709068587093cf194897913b8314387bbb2
diff --git a/services/wsprd/app/app_test.go b/services/wsprd/app/app_test.go
index 987344a..cf8cfb4 100644
--- a/services/wsprd/app/app_test.go
+++ b/services/wsprd/app/app_test.go
@@ -148,7 +148,7 @@
}
func TestGetGoServerSignature(t *testing.T) {
- ctx, shutdown := veyron2.Init()
+ ctx, shutdown := testutil.InitForTest()
defer shutdown()
s, endpoint, err := startAdderServer(ctx)
@@ -191,7 +191,7 @@
}
func runGoServerTestCase(t *testing.T, test goServerTestCase) {
- ctx, shutdown := veyron2.Init()
+ ctx, shutdown := testutil.InitForTest()
defer shutdown()
s, endpoint, err := startAdderServer(ctx)
@@ -341,7 +341,7 @@
}
func TestJavascriptServeServer(t *testing.T) {
- ctx, shutdown := veyron2.Init()
+ ctx, shutdown := testutil.InitForTest()
defer shutdown()
rt, err := serveServer(ctx)
@@ -366,7 +366,7 @@
}
func TestJavascriptStopServer(t *testing.T) {
- ctx, shutdown := veyron2.Init()
+ ctx, shutdown := testutil.InitForTest()
defer shutdown()
rt, err := serveServer(ctx)
@@ -423,7 +423,7 @@
}
func runJsServerTestCase(t *testing.T, test jsServerTestCase) {
- ctx, shutdown := veyron2.Init()
+ ctx, shutdown := testutil.InitForTest()
defer shutdown()
rt, err := serveServer(ctx)
diff --git a/services/wsprd/browspr/browspr_account_test.go b/services/wsprd/browspr/browspr_account_test.go
index 90078c4..5200ea0 100644
--- a/services/wsprd/browspr/browspr_account_test.go
+++ b/services/wsprd/browspr/browspr_account_test.go
@@ -10,6 +10,7 @@
"v.io/core/veyron2/ipc"
"v.io/core/veyron2/security"
+ "v.io/core/veyron/lib/testutil"
_ "v.io/core/veyron/profiles"
)
@@ -39,7 +40,7 @@
}
func setup(t *testing.T) (*Browspr, func()) {
- ctx, shutdown := veyron2.Init()
+ ctx, shutdown := testutil.InitForTest()
spec := veyron2.GetListenSpec(ctx)
spec.Proxy = "/mock/proxy"
diff --git a/services/wsprd/browspr/browspr_test.go b/services/wsprd/browspr/browspr_test.go
index 194368d..5a9457d 100644
--- a/services/wsprd/browspr/browspr_test.go
+++ b/services/wsprd/browspr/browspr_test.go
@@ -14,6 +14,7 @@
"v.io/core/veyron2/options"
"v.io/core/veyron2/vdl"
+ "v.io/core/veyron/lib/testutil"
_ "v.io/core/veyron/profiles"
"v.io/core/veyron/runtimes/google/ipc/stream/proxy"
mounttable "v.io/core/veyron/services/mounttable/lib"
@@ -78,7 +79,7 @@
}
func TestBrowspr(t *testing.T) {
- ctx, shutdown := veyron2.Init()
+ ctx, shutdown := testutil.InitForTest()
defer shutdown()
proxy, err := startProxy()
diff --git a/services/wsprd/lib/signature_manager_test.go b/services/wsprd/lib/signature_manager_test.go
index 4e47864..db2f18a 100644
--- a/services/wsprd/lib/signature_manager_test.go
+++ b/services/wsprd/lib/signature_manager_test.go
@@ -5,6 +5,7 @@
"sync"
"testing"
+ "v.io/core/veyron/lib/testutil"
_ "v.io/core/veyron/profiles/fake"
"v.io/core/veyron/runtimes/fake"
mocks_ipc "v.io/core/veyron/runtimes/google/testing/mocks/ipc"
@@ -19,7 +20,7 @@
)
func initContext(t *testing.T) (*context.T, *mocks_ipc.SimpleMockClient, veyron2.Shutdown) {
- ctx, shutdown := veyron2.Init()
+ ctx, shutdown := testutil.InitForTest()
initialSig := []signature.Interface{
{
Methods: []signature.Method{
