Merge branch '19129-wb1-dashboard-speedup' refs #19129

[arvados.git] / 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 62303eab639daba64b5c3524f787eaa911a102ea..f4a140c4069a9f0daa01d2263acb350ff604854c 100644 (file)
--- 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"
@@ -48,16 +49,14 @@ 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,
                // 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 +86,8 @@ 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).*`)
+       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 +124,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 +134,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