test/modules/shell.go: have a single NewShell call with functional expect.Session support.
MultiPart: 1/5
Change-Id: Iba39c53991f9528c619e63431106f42a35e58ebf
diff --git a/profiles/internal/ipc/stream/manager/manager_test.go b/profiles/internal/ipc/stream/manager/manager_test.go
index bf6e893..bcebc33 100644
--- a/profiles/internal/ipc/stream/manager/manager_test.go
+++ b/profiles/internal/ipc/stream/manager/manager_test.go
@@ -531,7 +531,7 @@
func testServerRestartDuringClientLifetime(t *testing.T, protocol string) {
client := InternalNew(naming.FixedRoutingID(0xcccccccc))
- sh, err := modules.NewShell(nil, nil)
+ sh, err := modules.NewShell(nil, nil, testing.Verbose(), t)
if err != nil {
t.Fatalf("unexpected error: %s", err)
}
@@ -561,9 +561,8 @@
if err != nil {
t.Fatalf("unexpected error: %s", err)
}
- s = expect.NewSession(t, h.Stdout(), time.Minute)
// Restarting the server, listening on the same address as before
- if addr2 := s.ReadLine(); addr2 != addr || err != nil {
+ if addr2 := h.ReadLine(); addr2 != addr || err != nil {
t.Fatalf("Got (%q, %v) want (%q, nil)", addr2, err, addr)
}
if _, err := client.Dial(ep); err != nil {
