ref: Rename test.InitForTest to test.V23Init
The test.Init function remains unchanged.
Change-Id: Ic3838daea7a5d57bf4efe34b6a6d5e446c835ae0
MultiPart: 2/3
diff --git a/lib/signals/signals_test.go b/lib/signals/signals_test.go
index aa0ed90..63b0097 100644
--- a/lib/signals/signals_test.go
+++ b/lib/signals/signals_test.go
@@ -45,7 +45,7 @@
}
func program(stdin io.Reader, stdout io.Writer, signals ...os.Signal) {
- ctx, shutdown := test.InitForTest()
+ ctx, shutdown := test.V23Init()
closeStopLoop := make(chan struct{})
go stopLoop(v23.GetAppCycle(ctx).Stop, stdin, closeStopLoop)
wait := ShutdownOnSignals(ctx, signals...)
@@ -71,7 +71,7 @@
}, "handleCustomWithStop")
var handleDefaultsIgnoreChan = modules.Register(func(env *modules.Env, args ...string) error {
- ctx, shutdown := test.InitForTest()
+ ctx, shutdown := test.V23Init()
defer shutdown()
closeStopLoop := make(chan struct{})
@@ -120,7 +120,7 @@
// 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) {
- ctx, shutdown := test.InitForTest()
+ ctx, shutdown := test.V23Init()
defer shutdown()
sh, h := newShell(t, ctx, handleDefaults)
@@ -136,7 +136,7 @@
// 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) {
- ctx, shutdown := test.InitForTest()
+ ctx, shutdown := test.V23Init()
defer shutdown()
sh, h := newShell(t, ctx, handleDefaults)
@@ -153,7 +153,7 @@
// 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) {
- ctx, shutdown := test.InitForTest()
+ ctx, shutdown := test.V23Init()
defer shutdown()
sh, h := newShell(t, ctx, handleCustomWithStop)
@@ -177,7 +177,7 @@
// 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) {
- ctx, shutdown := test.InitForTest()
+ ctx, shutdown := test.V23Init()
defer shutdown()
sh, h := newShell(t, ctx, handleCustom)
@@ -191,7 +191,7 @@
// that handles these signals by default causes the child to exit immediately
// upon receiving the second signal.
func TestDoubleSignal(t *testing.T) {
- ctx, shutdown := test.InitForTest()
+ ctx, shutdown := test.V23Init()
defer shutdown()
sh, h := newShell(t, ctx, handleDefaults)
@@ -209,7 +209,7 @@
// to a child that handles these by default causes the child to exit immediately
// upon receiving the stop command.
func TestSignalAndStop(t *testing.T) {
- ctx, shutdown := test.InitForTest()
+ ctx, shutdown := test.V23Init()
defer shutdown()
sh, h := newShell(t, ctx, handleDefaults)
@@ -226,7 +226,7 @@
// that handles stop commands by default causes the child to exit immediately
// upon receiving the second stop command.
func TestDoubleStop(t *testing.T) {
- ctx, shutdown := test.InitForTest()
+ ctx, shutdown := test.V23Init()
defer shutdown()
sh, h := newShell(t, ctx, handleDefaults)
@@ -241,7 +241,7 @@
// 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) {
- ctx, shutdown := test.InitForTest()
+ ctx, shutdown := test.V23Init()
defer shutdown()
sh, h := newShell(t, ctx, handleDefaults)
@@ -257,7 +257,7 @@
// 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) {
- ctx, shutdown := test.InitForTest()
+ ctx, shutdown := test.V23Init()
defer shutdown()
sh, h := newShell(t, ctx, handleDefaultsIgnoreChan)
@@ -275,7 +275,7 @@
// 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) {
- ctx, shutdown := test.InitForTest()
+ ctx, shutdown := test.V23Init()
defer shutdown()
sh, h := newShell(t, ctx, handleCustom)
@@ -292,7 +292,7 @@
// 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) {
- rootCtx, shutdown := test.InitForTest()
+ rootCtx, shutdown := test.V23Init()
defer shutdown()
for _, signal := range []syscall.Signal{syscall.SIGABRT, syscall.SIGHUP} {
@@ -353,7 +353,7 @@
// TestCleanRemoteShutdown verifies that remote shutdown works correctly.
func TestCleanRemoteShutdown(t *testing.T) {
- ctx, shutdown := test.InitForTest()
+ ctx, shutdown := test.V23Init()
defer shutdown()
sh, err := modules.NewShell(ctx, nil, testing.Verbose(), t)
