From 091ae55fc1df3ec50490becd437d512e38b0f972 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Wed, 6 Jul 2022 15:02:20 -0400 Subject: [PATCH] 19166: Test for hung-waiting-for-stdin bug. (Test fails on main branch, passes here with the StdinPipe fix in previous commit.) Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- cmd/arvados-client/container_gateway_test.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cmd/arvados-client/container_gateway_test.go b/cmd/arvados-client/container_gateway_test.go index f4a140c406..743b91d69b 100644 --- a/cmd/arvados-client/container_gateway_test.go +++ b/cmd/arvados-client/container_gateway_test.go @@ -25,6 +25,7 @@ import ( "git.arvados.org/arvados.git/lib/crunchrun" "git.arvados.org/arvados.git/sdk/go/arvados" "git.arvados.org/arvados.git/sdk/go/arvadostest" + "git.arvados.org/arvados.git/sdk/go/ctxlog" "git.arvados.org/arvados.git/sdk/go/httpserver" check "gopkg.in/check.v1" ) @@ -53,6 +54,7 @@ func (s *ClientSuite) TestShellGateway(c *check.C) { ContainerUUID: uuid, Address: "0.0.0.0:0", AuthSecret: authSecret, + Log: ctxlog.TestLogger(c), // Just forward connections to localhost instead of a // container, so we can test without running a // container. @@ -86,6 +88,13 @@ func (s *ClientSuite) TestShellGateway(c *check.C) { cmd.Env = append(cmd.Env, "ARVADOS_API_TOKEN="+arvadostest.ActiveTokenV2) cmd.Stdout = &stdout cmd.Stderr = &stderr + stdin, err := cmd.StdinPipe() + c.Assert(err, check.IsNil) + go fmt.Fprintln(stdin, "data appears on stdin, but stdin does not close; cmd should exit anyway, not hang") + time.AfterFunc(5*time.Second, func() { + c.Errorf("timed out -- remote end is probably hung waiting for us to close stdin") + stdin.Close() + }) c.Check(cmd.Run(), check.IsNil) c.Check(stdout.String(), check.Equals, "ok\n") -- 2.30.2