X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3cdc942884fe529b2ba973a20c92029aa55e6735..28f11611d09fa18d8dd09073ff3dc89a8337fe53:/cmd/arvados-client/container_gateway_test.go

diff --git a/cmd/arvados-client/container_gateway_test.go b/cmd/arvados-client/container_gateway_test.go
index 62303eab63..743b91d69b 100644
--- a/cmd/arvados-client/container_gateway_test.go
+++ b/cmd/arvados-client/container_gateway_test.go
@@ -18,12 +18,14 @@ import (
 	"os/exec"
 	"strings"
 	"sync"
+	"syscall"
 	"time"
 
 	"git.arvados.org/arvados.git/lib/controller/rpc"
 	"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"
 )
@@ -48,16 +50,15 @@ func (s *ClientSuite) TestShellGateway(c *check.C) {
 	h := hmac.New(sha256.New, []byte(arvadostest.SystemRootToken))
 	fmt.Fprint(h, uuid)
 	authSecret := fmt.Sprintf("%x", h.Sum(nil))
-	dcid := "theperthcountyconspiracy"
 	gw := crunchrun.Gateway{
-		DockerContainerID: &dcid,
-		ContainerUUID:     uuid,
-		Address:           "0.0.0.0:0",
-		AuthSecret:        authSecret,
+		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.
-		ContainerIPAddress: func() (string, error) { return "0.0.0.0", nil },
+		Target: crunchrun.GatewayTargetStub{},
 	}
 	err := gw.Start()
 	c.Assert(err, check.IsNil)
@@ -87,9 +88,15 @@ func (s *ClientSuite) TestShellGateway(c *check.C) {
 	cmd.Env = append(cmd.Env, "ARVADOS_API_TOKEN="+arvadostest.ActiveTokenV2)
 	cmd.Stdout = &stdout
 	cmd.Stderr = &stderr
-	c.Check(cmd.Run(), check.NotNil)
-	c.Log(stderr.String())
-	c.Check(stderr.String(), check.Matches, `(?ms).*(No such container: theperthcountyconspiracy|exec: \"docker\": executable file not found in \$PATH).*`)
+	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")
 
 	// Set up an http server, and try using "arvados-client shell"
 	// to forward traffic to it.
@@ -126,7 +133,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 +143,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