From 97227aa7827c0dfe471fd617e333f1228c5381ae Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Mon, 10 May 2021 10:17:16 -0400 Subject: [PATCH] 17657: Improve test failure messages. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- cmd/arvados-client/container_gateway_test.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cmd/arvados-client/container_gateway_test.go b/cmd/arvados-client/container_gateway_test.go index 62303eab63..89e926f594 100644 --- a/cmd/arvados-client/container_gateway_test.go +++ b/cmd/arvados-client/container_gateway_test.go @@ -18,6 +18,7 @@ import ( "os/exec" "strings" "sync" + "syscall" "time" "git.arvados.org/arvados.git/lib/controller/rpc" @@ -126,7 +127,7 @@ func (s *ClientSuite) TestShellGateway(c *check.C) { cmd.Env = append(cmd.Env, "ARVADOS_API_TOKEN="+arvadostest.ActiveTokenV2) cmd.Stdout = &stdout cmd.Stderr = &stderr - go cmd.Run() + cmd.Start() forwardedURL := fmt.Sprintf("http://localhost:%s/foo", forwardedPort) @@ -136,7 +137,14 @@ func (s *ClientSuite) TestShellGateway(c *check.C) { if !strings.Contains(err.Error(), "connect") { c.Fatal(err) } else if ctx.Err() != nil { - c.Fatal("timed out") + if cmd.Process.Signal(syscall.Signal(0)) != nil { + c.Error("OpenSSH exited") + } else { + c.Errorf("timed out trying to connect: %s", err) + } + c.Logf("OpenSSH stdout:\n%s", stdout.String()) + c.Logf("OpenSSH stderr:\n%s", stderr.String()) + c.FailNow() } // Retry until OpenSSH starts listening continue -- 2.30.2