core: Change rt.New to veyron2.Init.
Change-Id: Ibdc54c066442f09a12225d7f91a2f933edcdf628
diff --git a/lib/modules/core/core_test.go b/lib/modules/core/core_test.go
index 64eeabb..e5071c2 100644
--- a/lib/modules/core/core_test.go
+++ b/lib/modules/core/core_test.go
@@ -10,6 +10,7 @@
"testing"
"time"
+ "v.io/core/veyron2"
"v.io/core/veyron2/vlog"
"v.io/core/veyron/lib/expect"
@@ -18,7 +19,6 @@
"v.io/core/veyron/lib/modules/core"
"v.io/core/veyron/lib/testutil"
_ "v.io/core/veyron/profiles"
- "v.io/core/veyron2/rt"
)
func TestCommands(t *testing.T) {
@@ -38,11 +38,9 @@
// TODO(cnicolaou): add test for proxyd
func newShell(t *testing.T) (*modules.Shell, func()) {
- runtime, err := rt.New()
- if err != nil {
- panic(err)
- }
- sh, err := modules.NewShell(runtime.NewContext(), nil)
+ ctx, shutdown := veyron2.Init()
+
+ sh, err := modules.NewShell(ctx, nil)
if err != nil {
t.Fatalf("unexpected error: %s", err)
}
@@ -53,7 +51,7 @@
} else {
sh.Cleanup(nil, nil)
}
- runtime.Cleanup()
+ shutdown()
}
}
diff --git a/lib/modules/core/echo.go b/lib/modules/core/echo.go
index 34c11b8..92160b9 100644
--- a/lib/modules/core/echo.go
+++ b/lib/modules/core/echo.go
@@ -8,7 +8,6 @@
"v.io/core/veyron2"
"v.io/core/veyron2/ipc"
- "v.io/core/veyron2/rt"
"v.io/core/veyron2/security"
"v.io/core/veyron/lib/modules"
@@ -48,12 +47,8 @@
}
func echoServer(stdin io.Reader, stdout, stderr io.Writer, env map[string]string, args ...string) error {
- runtime, err := rt.New()
- if err != nil {
- panic(err)
- }
- defer runtime.Cleanup()
- ctx := runtime.NewContext()
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
fl, args, err := parseListenFlags(args)
if err != nil {
@@ -85,12 +80,8 @@
}
func echoClient(stdin io.Reader, stdout, stderr io.Writer, env map[string]string, args ...string) error {
- runtime, err := rt.New()
- if err != nil {
- panic(err)
- }
- defer runtime.Cleanup()
- ctx := runtime.NewContext()
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
args = args[1:]
name := args[0]
diff --git a/lib/modules/core/mounttable.go b/lib/modules/core/mounttable.go
index b549b65..6046c91 100644
--- a/lib/modules/core/mounttable.go
+++ b/lib/modules/core/mounttable.go
@@ -8,7 +8,6 @@
"v.io/core/veyron2"
"v.io/core/veyron2/options"
- "v.io/core/veyron2/rt"
"v.io/core/veyron/lib/modules"
mounttable "v.io/core/veyron/services/mounttable/lib"
@@ -32,12 +31,8 @@
}
func runMT(root bool, stdin io.Reader, stdout, stderr io.Writer, env map[string]string, args ...string) error {
- r, err := rt.New()
- if err != nil {
- panic(err)
- }
- defer r.Cleanup()
- ctx := r.NewContext()
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
fl, args, err := parseListenFlags(args)
if err != nil {
@@ -75,13 +70,8 @@
}
func ls(stdin io.Reader, stdout, stderr io.Writer, env map[string]string, args ...string) error {
- r, err := rt.New()
- if err != nil {
- panic(err)
- }
- defer r.Cleanup()
-
- ctx := r.NewContext()
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
details := false
args = args[1:] // skip over command name
diff --git a/lib/modules/core/proxy.go b/lib/modules/core/proxy.go
index 00d1977..f137cf8 100644
--- a/lib/modules/core/proxy.go
+++ b/lib/modules/core/proxy.go
@@ -8,7 +8,6 @@
"v.io/core/veyron2"
"v.io/core/veyron2/naming"
- "v.io/core/veyron2/rt"
"v.io/core/veyron/lib/modules"
"v.io/core/veyron/runtimes/google/ipc/stream/proxy"
@@ -20,11 +19,8 @@
}
func proxyServer(stdin io.Reader, stdout, stderr io.Writer, env map[string]string, args ...string) error {
- r, err := rt.New()
- if err != nil {
- panic(err)
- }
- ctx := r.NewContext()
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
fl, args, err := parseListenFlags(args)
if err != nil {
@@ -46,7 +42,6 @@
fmt.Fprintf(stdout, "PID=%d\n", os.Getpid())
fmt.Fprintf(stdout, "PROXY_NAME=%s\n", proxy.Endpoint().Name())
if expected > 0 {
- defer r.Cleanup()
pub := publisher.New(ctx, veyron2.GetNamespace(ctx), time.Minute)
defer pub.WaitForStop()
defer pub.Stop()
diff --git a/lib/modules/core/test_identityd.go b/lib/modules/core/test_identityd.go
index 8951102..f1bc19a 100644
--- a/lib/modules/core/test_identityd.go
+++ b/lib/modules/core/test_identityd.go
@@ -8,7 +8,7 @@
"strconv"
"time"
- "v.io/core/veyron2/rt"
+ "v.io/core/veyron2"
"v.io/core/veyron/lib/flags"
"v.io/core/veyron/lib/modules"
@@ -87,12 +87,9 @@
caveats.NewMockCaveatSelector())
l := initListenSpec(ifl)
- r, err := rt.New()
- if err != nil {
- return fmt.Errorf("rt.New() failed: %v", err)
- }
- defer r.Cleanup()
- ctx := r.NewContext()
+
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
_, veyronEPs, externalHttpaddress := s.Listen(ctx, &l, *host, *httpaddr, *tlsconfig)
diff --git a/lib/modules/examples_test.go b/lib/modules/examples_test.go
index ee78224..2784a03 100644
--- a/lib/modules/examples_test.go
+++ b/lib/modules/examples_test.go
@@ -6,6 +6,7 @@
"os"
"v.io/core/veyron/lib/modules"
+ "v.io/core/veyron2"
)
func init() {
@@ -20,6 +21,8 @@
}
func ExampleDispatch() {
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
if modules.IsModulesProcess() {
// Child process. Dispatch will invoke the 'echo' command
if err := modules.Dispatch(); err != nil {
@@ -28,7 +31,7 @@
return
}
// Parent process.
- sh, _ := modules.NewShell(runtime.NewContext(), nil)
+ sh, _ := modules.NewShell(ctx, nil)
defer sh.Cleanup(nil, nil)
h, _ := sh.Start("echo", nil, "a", "b")
h.Shutdown(os.Stdout, os.Stderr)
@@ -39,9 +42,11 @@
}
func ExampleDispatchAndExit() {
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
// DispatchAndExit will call os.Exit(0) when executed within the child.
modules.DispatchAndExit()
- sh, _ := modules.NewShell(runtime.NewContext(), nil)
+ sh, _ := modules.NewShell(ctx, nil)
defer sh.Cleanup(nil, nil)
h, _ := sh.Start("echo", nil, "c", "d")
h.Shutdown(os.Stdout, os.Stderr)
diff --git a/lib/modules/modules_internal_test.go b/lib/modules/modules_internal_test.go
index 3c26937..d3f9328 100644
--- a/lib/modules/modules_internal_test.go
+++ b/lib/modules/modules_internal_test.go
@@ -9,7 +9,7 @@
_ "v.io/core/veyron/profiles"
- "v.io/core/veyron2/rt"
+ "v.io/core/veyron2"
)
func Echo(stdin io.Reader, stdout, stderr io.Writer, env map[string]string, args ...string) error {
@@ -30,12 +30,10 @@
}
func TestState(t *testing.T) {
- r, err := rt.New()
- if err != nil {
- panic(err)
- }
- defer r.Cleanup()
- sh, err := NewShell(r.NewContext(), nil)
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
+
+ sh, err := NewShell(ctx, nil)
if err != nil {
t.Fatalf("unexpected error: %s", err)
}
diff --git a/lib/modules/modules_test.go b/lib/modules/modules_test.go
index 1f4e311..b92a696 100644
--- a/lib/modules/modules_test.go
+++ b/lib/modules/modules_test.go
@@ -21,13 +21,10 @@
_ "v.io/core/veyron/profiles"
"v.io/core/veyron2"
- "v.io/core/veyron2/rt"
)
const credentialsEnvPrefix = "\"" + consts.VeyronCredentials + "="
-var runtime veyron2.Runtime
-
func init() {
testutil.Init()
modules.RegisterChild("envtest", "envtest: <variables to print>...", PrintFromEnv)
@@ -40,11 +37,6 @@
modules.RegisterFunction("envtestf", "envtest: <variables to print>...", PrintFromEnv)
modules.RegisterFunction("echof", "[args]*", Echo)
modules.RegisterFunction("errortestFunc", "", ErrorMain)
- var err error
- runtime, err = rt.New()
- if err != nil {
- panic(err)
- }
}
func ignoresStdin(io.Reader, io.Writer, io.Writer, map[string]string, ...string) error {
@@ -61,7 +53,10 @@
}
func PrintBlessing(stdin io.Reader, stdout, stderr io.Writer, env map[string]string, args ...string) error {
- blessing := veyron2.GetPrincipal(runtime.NewContext()).BlessingStore().Default()
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
+
+ blessing := veyron2.GetPrincipal(ctx).BlessingStore().Default()
fmt.Fprintf(stdout, "%s", blessing)
return nil
}
@@ -159,7 +154,10 @@
}
func TestChild(t *testing.T) {
- sh, err := modules.NewShell(runtime.NewContext(), nil)
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
+
+ sh, err := modules.NewShell(ctx, nil)
if err != nil {
t.Fatalf("unexpected error: %s", err)
}
@@ -170,7 +168,10 @@
}
func TestAgent(t *testing.T) {
- sh, err := modules.NewShell(runtime.NewContext(), nil)
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
+
+ sh, err := modules.NewShell(ctx, nil)
if err != nil {
t.Fatalf("unexpected error: %s", err)
}
@@ -180,7 +181,7 @@
if a != b {
t.Errorf("Expected same blessing for children, got %s and %s", a, b)
}
- sh2, err := modules.NewShell(runtime.NewContext(), nil)
+ sh2, err := modules.NewShell(ctx, nil)
if err != nil {
t.Fatalf("unexpected error: %s", err)
}
@@ -192,9 +193,12 @@
}
func TestCustomPrincipal(t *testing.T) {
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
+
p := security.NewPrincipal("myshell")
cleanDebug := p.BlessingStore().DebugString()
- sh, err := modules.NewShell(runtime.NewContext(), p)
+ sh, err := modules.NewShell(ctx, p)
if err != nil {
t.Fatalf("unexpected error: %s", err)
}
@@ -224,7 +228,10 @@
}
func TestChildNoRegistration(t *testing.T) {
- sh, err := modules.NewShell(runtime.NewContext(), nil)
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
+
+ sh, err := modules.NewShell(ctx, nil)
if err != nil {
t.Fatalf("unexpected error: %s", err)
}
@@ -239,7 +246,10 @@
}
func TestFunction(t *testing.T) {
- sh, err := modules.NewShell(runtime.NewContext(), nil)
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
+
+ sh, err := modules.NewShell(ctx, nil)
if err != nil {
t.Fatalf("unexpected error: %s", err)
}
@@ -250,7 +260,10 @@
}
func TestErrorChild(t *testing.T) {
- sh, err := modules.NewShell(runtime.NewContext(), nil)
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
+
+ sh, err := modules.NewShell(ctx, nil)
if err != nil {
t.Fatalf("unexpected error: %s", err)
}
@@ -290,7 +303,10 @@
}
func TestShutdownSubprocess(t *testing.T) {
- sh, err := modules.NewShell(runtime.NewContext(), nil)
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
+
+ sh, err := modules.NewShell(ctx, nil)
if err != nil {
t.Fatalf("unexpected error: %s", err)
}
@@ -302,7 +318,10 @@
// forever if a child does not die upon closing stdin; but instead times out and
// returns an appropriate error.
func TestShutdownSubprocessIgnoresStdin(t *testing.T) {
- sh, err := modules.NewShell(runtime.NewContext(), nil)
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
+
+ sh, err := modules.NewShell(ctx, nil)
if err != nil {
t.Fatalf("unexpected error: %s", err)
}
@@ -327,7 +346,10 @@
// implementation inappropriately sets stdout to the file that is to be closed
// in Wait.
func TestStdoutRace(t *testing.T) {
- sh, err := modules.NewShell(runtime.NewContext(), nil)
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
+
+ sh, err := modules.NewShell(ctx, nil)
if err != nil {
t.Fatalf("unexpected error: %s", err)
}
@@ -359,7 +381,10 @@
}
func TestShutdownFunction(t *testing.T) {
- sh, err := modules.NewShell(runtime.NewContext(), nil)
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
+
+ sh, err := modules.NewShell(ctx, nil)
if err != nil {
t.Fatalf("unexpected error: %s", err)
}
@@ -368,7 +393,10 @@
}
func TestErrorFunc(t *testing.T) {
- sh, err := modules.NewShell(runtime.NewContext(), nil)
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
+
+ sh, err := modules.NewShell(ctx, nil)
if err != nil {
t.Fatalf("unexpected error: %s", err)
}
@@ -392,7 +420,10 @@
}
func TestEnvelope(t *testing.T) {
- sh, err := modules.NewShell(runtime.NewContext(), nil)
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
+
+ sh, err := modules.NewShell(ctx, nil)
if err != nil {
t.Fatalf("unexpected error: %s", err)
}
@@ -444,7 +475,10 @@
}
func TestEnvMerge(t *testing.T) {
- sh, err := modules.NewShell(runtime.NewContext(), nil)
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
+
+ sh, err := modules.NewShell(ctx, nil)
if err != nil {
t.Fatalf("unexpected error: %s", err)
}
diff --git a/lib/signals/signals_test.go b/lib/signals/signals_test.go
index 21d3430..83f3438 100644
--- a/lib/signals/signals_test.go
+++ b/lib/signals/signals_test.go
@@ -16,8 +16,8 @@
"v.io/core/veyron2/ipc"
"v.io/core/veyron2/mgmt"
"v.io/core/veyron2/naming"
- "v.io/core/veyron2/rt"
"v.io/core/veyron2/services/mgmt/appcycle"
+ "v.io/core/veyron2/vtrace"
"v.io/core/veyron/lib/expect"
"v.io/core/veyron/lib/modules"
@@ -54,19 +54,14 @@
}
func program(stdin io.Reader, stdout io.Writer, signals ...os.Signal) {
- runtime, err := rt.New()
- if err != nil {
- panic(err)
- }
-
- ctx := runtime.NewContext()
+ ctx, shutdown := veyron2.Init()
closeStopLoop := make(chan struct{})
go stopLoop(ctx, stdin, closeStopLoop)
wait := ShutdownOnSignals(ctx, signals...)
fmt.Fprintf(stdout, "ready\n")
fmt.Fprintf(stdout, "received signal %s\n", <-wait)
- runtime.Cleanup()
+ shutdown()
<-closeStopLoop
}
@@ -86,13 +81,8 @@
}
func handleDefaultsIgnoreChan(stdin io.Reader, stdout, stderr io.Writer, env map[string]string, args ...string) error {
- runtime, err := rt.New()
- if err != nil {
- panic(err)
- }
- defer runtime.Cleanup()
-
- ctx := runtime.NewContext()
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
closeStopLoop := make(chan struct{})
go stopLoop(ctx, stdin, closeStopLoop)
@@ -123,8 +113,8 @@
}
}
-func newShell(t *testing.T, r veyron2.Runtime, command string) (*modules.Shell, modules.Handle, *expect.Session) {
- sh, err := modules.NewShell(r.NewContext(), nil)
+func newShell(t *testing.T, ctx *context.T, command string) (*modules.Shell, modules.Handle, *expect.Session) {
+ sh, err := modules.NewShell(ctx, nil)
if err != nil {
t.Fatalf("unexpected error: %s", err)
}
@@ -141,12 +131,10 @@
// TestCleanShutdownSignal verifies that sending a signal to a child that
// handles it by default causes the child to shut down cleanly.
func TestCleanShutdownSignal(t *testing.T) {
- runtime, err := rt.New()
- if err != nil {
- panic(err)
- }
- defer runtime.Cleanup()
- sh, h, s := newShell(t, runtime, "handleDefaults")
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
+
+ sh, h, s := newShell(t, ctx, "handleDefaults")
defer sh.Cleanup(os.Stderr, os.Stderr)
s.Expect("ready")
checkSignalIsDefault(t, syscall.SIGINT)
@@ -159,12 +147,10 @@
// TestCleanShutdownStop verifies that sending a stop comamnd to a child that
// handles stop commands by default causes the child to shut down cleanly.
func TestCleanShutdownStop(t *testing.T) {
- runtime, err := rt.New()
- if err != nil {
- panic(err)
- }
- defer runtime.Cleanup()
- sh, h, s := newShell(t, runtime, "handleDefaults")
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
+
+ sh, h, s := newShell(t, ctx, "handleDefaults")
defer sh.Cleanup(os.Stderr, os.Stderr)
s.Expect("ready")
fmt.Fprintf(h.Stdin(), "stop\n")
@@ -178,12 +164,10 @@
// that handles stop command as part of a custom set of signals handled, causes
// the child to shut down cleanly.
func TestCleanShutdownStopCustom(t *testing.T) {
- runtime, err := rt.New()
- if err != nil {
- panic(err)
- }
- defer runtime.Cleanup()
- sh, h, s := newShell(t, runtime, "handleCustomWithStop")
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
+
+ sh, h, s := newShell(t, ctx, "handleCustomWithStop")
defer sh.Cleanup(os.Stderr, os.Stderr)
s.Expect("ready")
fmt.Fprintf(h.Stdin(), "stop\n")
@@ -204,12 +188,10 @@
// TestStopNoHandler verifies that sending a stop command to a child that does
// not handle stop commands causes the child to exit immediately.
func TestStopNoHandler(t *testing.T) {
- runtime, err := rt.New()
- if err != nil {
- panic(err)
- }
- defer runtime.Cleanup()
- sh, h, s := newShell(t, runtime, "handleCustom")
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
+
+ sh, h, s := newShell(t, ctx, "handleCustom")
defer sh.Cleanup(os.Stderr, os.Stderr)
s.Expect("ready")
fmt.Fprintf(h.Stdin(), "stop\n")
@@ -220,12 +202,10 @@
// that handles these signals by default causes the child to exit immediately
// upon receiving the second signal.
func TestDoubleSignal(t *testing.T) {
- runtime, err := rt.New()
- if err != nil {
- panic(err)
- }
- defer runtime.Cleanup()
- sh, h, s := newShell(t, runtime, "handleDefaults")
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
+
+ sh, h, s := newShell(t, ctx, "handleDefaults")
defer sh.Cleanup(os.Stderr, os.Stderr)
s.Expect("ready")
checkSignalIsDefault(t, syscall.SIGTERM)
@@ -240,12 +220,10 @@
// to a child that handles these by default causes the child to exit immediately
// upon receiving the stop command.
func TestSignalAndStop(t *testing.T) {
- runtime, err := rt.New()
- if err != nil {
- panic(err)
- }
- defer runtime.Cleanup()
- sh, h, s := newShell(t, runtime, "handleDefaults")
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
+
+ sh, h, s := newShell(t, ctx, "handleDefaults")
defer sh.Cleanup(os.Stderr, os.Stderr)
s.Expect("ready")
checkSignalIsDefault(t, syscall.SIGTERM)
@@ -259,12 +237,10 @@
// that handles stop commands by default causes the child to exit immediately
// upon receiving the second stop command.
func TestDoubleStop(t *testing.T) {
- runtime, err := rt.New()
- if err != nil {
- panic(err)
- }
- defer runtime.Cleanup()
- sh, h, s := newShell(t, runtime, "handleDefaults")
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
+
+ sh, h, s := newShell(t, ctx, "handleDefaults")
defer sh.Cleanup(os.Stderr, os.Stderr)
s.Expect("ready")
fmt.Fprintf(h.Stdin(), "stop\n")
@@ -276,12 +252,10 @@
// TestSendUnhandledSignal verifies that sending a signal that the child does
// not handle causes the child to exit as per the signal being sent.
func TestSendUnhandledSignal(t *testing.T) {
- runtime, err := rt.New()
- if err != nil {
- panic(err)
- }
- defer runtime.Cleanup()
- sh, h, s := newShell(t, runtime, "handleDefaults")
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
+
+ sh, h, s := newShell(t, ctx, "handleDefaults")
defer sh.Cleanup(os.Stderr, os.Stderr)
s.Expect("ready")
checkSignalIsNotDefault(t, syscall.SIGABRT)
@@ -294,12 +268,10 @@
// process to exit (ensures that there is no dependency in ShutdownOnSignals
// on having a goroutine read from the returned channel).
func TestDoubleSignalIgnoreChan(t *testing.T) {
- runtime, err := rt.New()
- if err != nil {
- panic(err)
- }
- defer runtime.Cleanup()
- sh, h, s := newShell(t, runtime, "handleDefaultsIgnoreChan")
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
+
+ sh, h, s := newShell(t, ctx, "handleDefaultsIgnoreChan")
defer sh.Cleanup(os.Stderr, os.Stderr)
s.Expect("ready")
// Even if we ignore the channel that ShutdownOnSignals returns,
@@ -314,12 +286,10 @@
// TestHandlerCustomSignal verifies that sending a non-default signal to a
// server that listens for that signal causes the server to shut down cleanly.
func TestHandlerCustomSignal(t *testing.T) {
- runtime, err := rt.New()
- if err != nil {
- panic(err)
- }
- defer runtime.Cleanup()
- sh, h, s := newShell(t, runtime, "handleCustom")
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
+
+ sh, h, s := newShell(t, ctx, "handleCustom")
defer sh.Cleanup(os.Stderr, os.Stderr)
s.Expect("ready")
checkSignalIsNotDefault(t, syscall.SIGABRT)
@@ -333,13 +303,12 @@
// to a server that listens for that signal causes the server to shut down
// cleanly, even when a STOP signal is also among the handled signals.
func TestHandlerCustomSignalWithStop(t *testing.T) {
- runtime, err := rt.New()
- if err != nil {
- panic(err)
- }
- defer runtime.Cleanup()
+ rootCtx, shutdown := veyron2.Init()
+ defer shutdown()
+
for _, signal := range []syscall.Signal{syscall.SIGABRT, syscall.SIGHUP} {
- sh, h, s := newShell(t, runtime, "handleCustomWithStop")
+ ctx, _ := vtrace.SetNewTrace(rootCtx)
+ sh, h, s := newShell(t, ctx, "handleCustomWithStop")
s.Expect("ready")
checkSignalIsNotDefault(t, signal)
syscall.Kill(h.Pid(), signal)
@@ -395,14 +364,10 @@
// TestCleanRemoteShutdown verifies that remote shutdown works correctly.
func TestCleanRemoteShutdown(t *testing.T) {
- runtime, err := rt.New()
- if err != nil {
- panic(err)
- }
- defer runtime.Cleanup()
- ctx := runtime.NewContext()
+ ctx, shutdown := veyron2.Init()
+ defer shutdown()
- sh, err := modules.NewShell(runtime.NewContext(), nil)
+ sh, err := modules.NewShell(ctx, nil)
if err != nil {
t.Fatalf("unexpected error: %s", err)
}
diff --git a/lib/testutil/integration/util.go b/lib/testutil/integration/util.go
index 61de99d..335150d 100644
--- a/lib/testutil/integration/util.go
+++ b/lib/testutil/integration/util.go
@@ -40,8 +40,7 @@
"v.io/core/veyron/lib/modules"
"v.io/core/veyron/lib/modules/core"
tsecurity "v.io/core/veyron/lib/testutil/security"
- "v.io/core/veyron2/options"
- "v.io/core/veyron2/rt"
+ "v.io/core/veyron2"
"v.io/core/veyron2/security"
)
@@ -132,6 +131,9 @@
// The testing framework.
t *testing.T
+ // The function to shutdown the context used to create the environment.
+ shutdown veyron2.Shutdown
+
// The shell to use to start commands.
shell *modules.Shell
@@ -261,6 +263,8 @@
}
func (e *integrationTestEnvironment) Cleanup() {
+ e.shutdown()
+
for _, binary := range e.builtBinaries {
binary.cleanupFunc()
}
@@ -397,13 +401,16 @@
// ...
// }
func NewTestEnvironment(t *testing.T) TestEnvironment {
+ ctx, shutdown := veyron2.Init()
+
t.Log("creating root principal")
principal := tsecurity.NewPrincipal("root")
- runtime, err := rt.New(options.RuntimePrincipal{principal})
+ ctx, err := veyron2.SetPrincipal(ctx, principal)
if err != nil {
- t.Fatalf("rt.New() failed: %v", err)
+ t.Fatalf("failed to set principal: %v", err)
}
- shell, err := modules.NewShell(runtime.NewContext(), principal)
+
+ shell, err := modules.NewShell(ctx, principal)
if err != nil {
t.Fatalf("NewShell() failed: %v", err)
}
@@ -424,6 +431,7 @@
mtEndpoint: mtEndpoint,
tempFiles: []*os.File{},
tempDirs: []string{},
+ shutdown: shutdown,
}
}
diff --git a/lib/testutil/security/util_test.go b/lib/testutil/security/util_test.go
index 2057f54..440533a 100644
--- a/lib/testutil/security/util_test.go
+++ b/lib/testutil/security/util_test.go
@@ -7,7 +7,6 @@
"sort"
"testing"
- "v.io/core/veyron2/rt"
"v.io/core/veyron2/security"
"v.io/core/veyron2/services/security/access"
@@ -65,11 +64,6 @@
}
func TestSaveACLToFile(t *testing.T) {
- r, err := rt.New()
- if err != nil {
- t.Fatalf("rt.New failed: %v", err)
- }
- defer r.Cleanup()
acl := access.TaggedACLMap{
"Admin": access.ACL{
In: []security.BlessingPattern{"comics/..."},
