x/ref: clean up use of test.InitWithParams as per v.io/i/599
Change-Id: I7b5d2a781abcb2efec297dfcd0a49de1794ebc40
diff --git a/lib/security/audit/principal_test.go b/lib/security/audit/principal_test.go
index cec8999..751fe23 100644
--- a/lib/security/audit/principal_test.go
+++ b/lib/security/audit/principal_test.go
@@ -25,7 +25,7 @@
)
func TestAuditingPrincipal(t *testing.T) {
- ctx, shutdown := test.V23InitWithParams(test.InitParams{})
+ ctx, shutdown := test.V23InitAnon()
defer shutdown()
var (
thirdPartyCaveat, discharge = newThirdPartyCaveatAndDischarge(t)
@@ -129,7 +129,7 @@
}
func TestUnauditedMethodsOnPrincipal(t *testing.T) {
- ctx, shutdown := test.V23InitWithParams(test.InitParams{})
+ ctx, shutdown := test.V23InitAnon()
defer shutdown()
var (
auditor = new(mockAuditor)
diff --git a/runtime/internal/naming/namespace/cache_test.go b/runtime/internal/naming/namespace/cache_test.go
index 17fc42d..b3606f8 100644
--- a/runtime/internal/naming/namespace/cache_test.go
+++ b/runtime/internal/naming/namespace/cache_test.go
@@ -27,8 +27,8 @@
// TestCache tests the cache directly rather than via the namespace methods.
func TestCache(t *testing.T) {
- ctx, shutdown := test.V23InitWithParams(test.InitParams{})
- defer shutdown()
+ ctx, cancel := test.TestContext()
+ defer cancel()
preload := []struct {
name string
suffix string
@@ -69,8 +69,8 @@
}
func TestCacheLimit(t *testing.T) {
- ctx, shutdown := test.V23InitWithParams(test.InitParams{})
- defer shutdown()
+ ctx, cancel := test.TestContext()
+ defer cancel()
c := newTTLCache().(*ttlCache)
e := &naming.MountEntry{Servers: []naming.MountedServer{naming.MountedServer{Server: "the rain in spain", Deadline: future(3000)}}}
for i := 0; i < maxCacheEntries; i++ {
@@ -87,8 +87,8 @@
}
func TestCacheTTL(t *testing.T) {
- ctx, shutdown := test.V23InitWithParams(test.InitParams{})
- defer shutdown()
+ ctx, cancel := test.TestContext()
+ defer cancel()
before := vdltime.Deadline{time.Now()}
c := newTTLCache().(*ttlCache)
// Fill cache.
@@ -113,8 +113,8 @@
}
func TestFlushCacheEntry(t *testing.T) {
- ctx, shutdown := test.V23InitWithParams(test.InitParams{})
- defer shutdown()
+ ctx, cancel := test.TestContext()
+ defer cancel()
preload := []struct {
name string
server string
@@ -166,8 +166,8 @@
}
func TestCacheDisableEnable(t *testing.T) {
- ctx, shutdown := test.V23InitWithParams(test.InitParams{})
- defer shutdown()
+ ctx, cancel := test.TestContext()
+ defer cancel()
ns, _ := New()
// Default should be working resolution cache.
diff --git a/runtime/internal/rpc/stream/vif/set_test.go b/runtime/internal/rpc/stream/vif/set_test.go
index 66925dc..5ecf5d0 100644
--- a/runtime/internal/rpc/stream/vif/set_test.go
+++ b/runtime/internal/rpc/stream/vif/set_test.go
@@ -105,7 +105,7 @@
}
func TestSetBasic(t *testing.T) {
- ctx, shutdown := test.V23InitWithParams(test.InitParams{})
+ ctx, shutdown := test.V23InitAnon()
defer shutdown()
sockdir, err := ioutil.TempDir("", "TestSetBasic")
if err != nil {
@@ -178,7 +178,7 @@
}
func TestSetWithPipes(t *testing.T) {
- ctx, shutdown := test.V23InitWithParams(test.InitParams{})
+ ctx, shutdown := test.V23InitAnon()
defer shutdown()
c1, s1 := net.Pipe()
c2, s2 := net.Pipe()
@@ -227,7 +227,7 @@
}
func TestSetWithUnixSocket(t *testing.T) {
- ctx, shutdown := test.V23InitWithParams(test.InitParams{})
+ ctx, shutdown := test.V23InitAnon()
defer shutdown()
dir, err := ioutil.TempDir("", "TestSetWithUnixSocket")
if err != nil {
@@ -290,7 +290,7 @@
}
func TestSetInsertDelete(t *testing.T) {
- ctx, shutdown := test.V23InitWithParams(test.InitParams{})
+ ctx, shutdown := test.V23InitAnon()
defer shutdown()
c1, s1 := net.Pipe()
vf1, _, err := newVIF(ctx, c1, s1)
@@ -313,7 +313,7 @@
}
func TestBlockingFind(t *testing.T) {
- ctx, shutdown := test.V23InitWithParams(test.InitParams{})
+ ctx, shutdown := test.V23InitAnon()
defer shutdown()
network, address := "tcp", "127.0.0.1:1234"
set := vif.NewSet()
diff --git a/runtime/internal/rpc/stream/vif/vcmap_test.go b/runtime/internal/rpc/stream/vif/vcmap_test.go
index bc29468..350dd40 100644
--- a/runtime/internal/rpc/stream/vif/vcmap_test.go
+++ b/runtime/internal/rpc/stream/vif/vcmap_test.go
@@ -13,8 +13,8 @@
)
func TestVCMap(t *testing.T) {
- ctx, shutdown := test.V23InitWithParams(test.InitParams{})
- defer shutdown()
+ ctx, cancel := test.TestContext()
+ defer cancel()
m := newVCMap()
vc12 := vc.InternalNew(ctx, vc.Params{VCI: 12})
@@ -46,8 +46,8 @@
}
func TestVCMapFreeze(t *testing.T) {
- ctx, shutdown := test.V23InitWithParams(test.InitParams{})
- defer shutdown()
+ ctx, cancel := test.TestContext()
+ defer cancel()
m := newVCMap()
vc1 := vc.InternalNew(ctx, vc.Params{VCI: 1})
vc2 := vc.InternalNew(ctx, vc.Params{VCI: 2})
@@ -68,8 +68,8 @@
}
func TestVCMapDelete(t *testing.T) {
- ctx, shutdown := test.V23InitWithParams(test.InitParams{})
- defer shutdown()
+ ctx, cancel := test.TestContext()
+ defer cancel()
m := newVCMap()
vc1 := vc.InternalNew(ctx, vc.Params{VCI: 1})
diff --git a/runtime/internal/rpc/stream/vif/vif_test.go b/runtime/internal/rpc/stream/vif/vif_test.go
index 2c5c2f7..908a711 100644
--- a/runtime/internal/rpc/stream/vif/vif_test.go
+++ b/runtime/internal/rpc/stream/vif/vif_test.go
@@ -37,7 +37,7 @@
//go:generate v23 test generate
func TestSingleFlowCreatedAtClient(t *testing.T) {
- ctx, shutdown := test.V23InitWithParams(test.InitParams{})
+ ctx, shutdown := test.V23InitAnon()
defer shutdown()
pclient := testutil.NewPrincipal("client")
pserver := testutil.NewPrincipal("server")
@@ -65,7 +65,7 @@
}
func TestSingleFlowCreatedAtServer(t *testing.T) {
- ctx, shutdown := test.V23InitWithParams(test.InitParams{})
+ ctx, shutdown := test.V23InitAnon()
defer shutdown()
pclient := testutil.NewPrincipal("client")
pserver := testutil.NewPrincipal("server")
@@ -96,7 +96,7 @@
func testMultipleVCsAndMultipleFlows(t *testing.T, gomaxprocs int) {
testutil.InitRandGenerator(t.Logf)
- ctx, shutdown := test.V23InitWithParams(test.InitParams{})
+ ctx, shutdown := test.V23InitAnon()
defer shutdown()
// This test dials multiple VCs from the client to the server.
// On each VC, it creates multiple flows, writes to them and verifies
@@ -255,7 +255,7 @@
}
func TestClose(t *testing.T) {
- ctx, shutdown := test.V23InitWithParams(test.InitParams{})
+ ctx, shutdown := test.V23InitAnon()
defer shutdown()
pclient := testutil.NewPrincipal("client")
pserver := testutil.NewPrincipal("server")
@@ -294,7 +294,7 @@
}
func TestOnClose(t *testing.T) {
- ctx, shutdown := test.V23InitWithParams(test.InitParams{})
+ ctx, shutdown := test.V23InitAnon()
defer shutdown()
pclient := testutil.NewPrincipal("client")
pserver := testutil.NewPrincipal("server")
@@ -335,7 +335,7 @@
const (
waitTime = 5 * time.Millisecond
)
- ctx, shutdown := test.V23InitWithParams(test.InitParams{})
+ ctx, shutdown := test.V23InitAnon()
defer shutdown()
pclient := testutil.NewPrincipal("client")
pserver := testutil.NewPrincipal("server")
@@ -424,7 +424,7 @@
// connection of the other side to be closed especially in race testing.
waitTime = 150 * time.Millisecond
)
- ctx, shutdown := test.V23InitWithParams(test.InitParams{})
+ ctx, shutdown := test.V23InitAnon()
defer shutdown()
pclient := testutil.NewPrincipal("client")
pserver := testutil.NewPrincipal("server")
@@ -485,7 +485,7 @@
idleTime = 10 * time.Millisecond
waitTime = idleTime * 2
)
- ctx, shutdown := test.V23InitWithParams(test.InitParams{})
+ ctx, shutdown := test.V23InitAnon()
defer shutdown()
pclient := testutil.NewPrincipal("client")
pserver := testutil.NewPrincipal("server")
@@ -603,7 +603,7 @@
func TestIdleTimeoutServer(t *testing.T) { testIdleTimeout(t, true) }
func TestShutdownVCs(t *testing.T) {
- ctx, shutdown := test.V23InitWithParams(test.InitParams{})
+ ctx, shutdown := test.V23InitAnon()
defer shutdown()
pclient := testutil.NewPrincipal("client")
pserver := testutil.NewPrincipal("server")
@@ -670,7 +670,7 @@
}
func (tc *versionTestCase) Run(t *testing.T) {
- ctx, shutdown := test.V23InitWithParams(test.InitParams{})
+ ctx, shutdown := test.V23InitAnon()
defer shutdown()
pclient := testutil.NewPrincipal("client")
pserver := testutil.NewPrincipal("server")
@@ -730,7 +730,7 @@
}
func TestNetworkFailure(t *testing.T) {
- ctx, shutdown := test.V23InitWithParams(test.InitParams{})
+ ctx, shutdown := test.V23InitAnon()
defer shutdown()
pclient := testutil.NewPrincipal("client")
pserver := testutil.NewPrincipal("server")
@@ -764,7 +764,7 @@
}
func TestPreAuthentication(t *testing.T) {
- ctx, shutdown := test.V23InitWithParams(test.InitParams{})
+ ctx, shutdown := test.V23InitAnon()
defer shutdown()
pclient := testutil.NewPrincipal("client")
pserver := testutil.NewPrincipal("server")
diff --git a/runtime/internal/rpc/testutil_test.go b/runtime/internal/rpc/testutil_test.go
index 0dca147..105638d 100644
--- a/runtime/internal/rpc/testutil_test.go
+++ b/runtime/internal/rpc/testutil_test.go
@@ -79,7 +79,7 @@
}
func initForTest() (*context.T, v23.Shutdown) {
- ctx, shutdown := test.V23InitWithParams(test.InitParams{})
+ ctx, shutdown := test.V23InitAnon()
ctx, err := ivtrace.Init(ctx, flags.VtraceFlags{})
if err != nil {
panic(err)
diff --git a/services/identity/internal/auditor/blessing_auditor_test.go b/services/identity/internal/auditor/blessing_auditor_test.go
index 84919c7..5ce9400 100644
--- a/services/identity/internal/auditor/blessing_auditor_test.go
+++ b/services/identity/internal/auditor/blessing_auditor_test.go
@@ -16,8 +16,8 @@
)
func TestBlessingAuditor(t *testing.T) {
- ctx, shutdown := test.V23InitWithParams(test.InitParams{})
- defer shutdown()
+ ctx, cancel := test.TestContext()
+ defer cancel()
auditor, reader := NewMockBlessingAuditor()
p, err := vsecurity.NewPrincipal()
diff --git a/services/identity/internal/auditor/sql_database_test.go b/services/identity/internal/auditor/sql_database_test.go
index 281e8f4..e85b744 100644
--- a/services/identity/internal/auditor/sql_database_test.go
+++ b/services/identity/internal/auditor/sql_database_test.go
@@ -16,8 +16,8 @@
)
func TestSQLDatabaseQuery(t *testing.T) {
- ctx, shutdown := test.V23InitWithParams(test.InitParams{})
- defer shutdown()
+ ctx, cancel := test.TestContext()
+ defer cancel()
db, err := sqlmock.New()
if err != nil {
t.Fatalf("failed to create new mock database stub: %v", err)
diff --git a/services/mounttable/mounttablelib/mounttable_test.go b/services/mounttable/mounttablelib/mounttable_test.go
index 9d9df27..9afb038 100644
--- a/services/mounttable/mounttablelib/mounttable_test.go
+++ b/services/mounttable/mounttablelib/mounttable_test.go
@@ -648,7 +648,7 @@
}
func TestBadAccessLists(t *testing.T) {
- ctx, shutdown := test.V23InitWithParams(test.InitParams{})
+ ctx, shutdown := test.TestContext()
defer shutdown()
_, err := mounttablelib.NewMountTableDispatcher(ctx, "testdata/invalid.perms", "", "mounttable")
if err == nil {
diff --git a/services/wspr/internal/lib/signature_manager_test.go b/services/wspr/internal/lib/signature_manager_test.go
index 80fb562..689df80 100644
--- a/services/wspr/internal/lib/signature_manager_test.go
+++ b/services/wspr/internal/lib/signature_manager_test.go
@@ -21,8 +21,8 @@
name = "/vanadium/name"
)
-func initContext(t *testing.T) (*context.T, clientWithTimesCalled, v23.Shutdown) {
- ctx, shutdown := test.V23InitWithParams(test.InitParams{})
+func initRuntime(t *testing.T) (*context.T, clientWithTimesCalled, v23.Shutdown) {
+ ctx, shutdown := test.V23InitAnon()
initialSig := []signature.Interface{
{
Methods: []signature.Method{
@@ -43,7 +43,7 @@
}
func TestFetching(t *testing.T) {
- ctx, _, shutdown := initContext(t)
+ ctx, _, shutdown := initRuntime(t)
defer shutdown()
sm := NewSignatureManager()
@@ -69,7 +69,7 @@
}
func TestThatCachedAfterFetching(t *testing.T) {
- ctx, _, shutdown := initContext(t)
+ ctx, _, shutdown := initRuntime(t)
defer shutdown()
sm := NewSignatureManager().(*signatureManager)
@@ -85,7 +85,7 @@
}
func TestThatCacheIsUsed(t *testing.T) {
- ctx, client, shutdown := initContext(t)
+ ctx, client, shutdown := initRuntime(t)
defer shutdown()
// call twice
@@ -101,7 +101,7 @@
}
func TestThatLastAccessedGetUpdated(t *testing.T) {
- ctx, _, shutdown := initContext(t)
+ ctx, _, shutdown := initRuntime(t)
defer shutdown()
sm := NewSignatureManager().(*signatureManager)
@@ -121,7 +121,7 @@
}
func TestThatTTLExpires(t *testing.T) {
- ctx, client, shutdown := initContext(t)
+ ctx, client, shutdown := initRuntime(t)
defer shutdown()
sm := NewSignatureManager().(*signatureManager)
@@ -140,7 +140,7 @@
}
func TestConcurrency(t *testing.T) {
- ctx, client, shutdown := initContext(t)
+ ctx, client, shutdown := initRuntime(t)
defer shutdown()
sm := NewSignatureManager().(*signatureManager)
diff --git a/test/init.go b/test/init.go
index b8b6cc2..c627309 100644
--- a/test/init.go
+++ b/test/init.go
@@ -72,22 +72,22 @@
// using the modules package.
func V23Init() (*context.T, v23.Shutdown) {
moduleProcess := os.Getenv("V23_SHELL_HELPER_PROCESS_ENTRY_POINT") != ""
- return V23InitWithParams(InitParams{
+ return initWithParams(initParams{
CreatePrincipal: !moduleProcess,
CreateMounttable: !moduleProcess,
})
}
-// Params contains parameters for tests that need to control what happens during
+// initParams contains parameters for tests that need to control what happens during
// init carefully.
-type InitParams struct {
+type initParams struct {
CreateMounttable bool // CreateMounttable creates a new mounttable.
CreatePrincipal bool // CreatePrincipal creates a new principal with self-signed blessing.
}
-// V23InitWithParams initializes the runtime and returns a new context and shutdown function.
+// initWithParams initializes the runtime and returns a new context and shutdown function.
// Specific aspects of initialization can be controlled via the params struct.
-func V23InitWithParams(params InitParams) (*context.T, v23.Shutdown) {
+func initWithParams(params initParams) (*context.T, v23.Shutdown) {
ctx, shutdown := v23.Init()
if params.CreatePrincipal {
var err error
@@ -110,3 +110,19 @@
}
return ctx, shutdown
}
+
+// TestContext returns a *contect.T suitable for use in tests with logging
+// configured to use loggler.Global(), but nothing else. In particular it does
+// not call v23.Init and hence any of the v23 functions that
+func TestContext() (*context.T, context.CancelFunc) {
+ ctx, cancel := context.RootContext()
+ return context.WithLogger(ctx, logger.Global()), cancel
+}
+
+// V23InitEmpty initializes a runtime but with no principal.
+func V23InitAnon() (*context.T, v23.Shutdown) {
+ return initWithParams(initParams{
+ CreatePrincipal: false,
+ CreateMounttable: false,
+ })
+}
