19175: Merge branch 'main' into 19175-doc-refactor-multi-host-installation

[arvados.git] / lib / controller / integration_test.go

diff --git a/lib/controller/integration_test.go b/lib/controller/integration_test.go
index fb5dce6b3eba6e97803b11852d888fb0c656162e..67d60197e7e160b5f7d99e510106a55a18ffd07f 100644 (file)
--- a/lib/controller/integration_test.go
+++ b/lib/controller/integration_test.go
@@ -1127,7 +1127,7 @@ func (s *IntegrationSuite) TestForwardRuntimeTokenToLoginCluster(c *check.C) {
 
 func (s *IntegrationSuite) TestRunTrivialContainer(c *check.C) {
        outcoll := s.runContainer(c, "z1111", map[string]interface{}{
-               "command":             []string{"touch", "/out/hello_world"},
+               "command":             []string{"sh", "-c", "touch \"/out/hello world\" /out/ohai"},
                "container_image":     "busybox:uclibc",
                "cwd":                 "/tmp",
                "environment":         map[string]string{},
@@ -1137,8 +1137,8 @@ func (s *IntegrationSuite) TestRunTrivialContainer(c *check.C) {
                "priority":            1,
                "state":               arvados.ContainerRequestStateCommitted,
        }, 0)
-       c.Check(outcoll.ManifestText, check.Matches, `\. d41d8.* 0:0:hello_world\n`)
-       c.Check(outcoll.PortableDataHash, check.Equals, "dac08d558cfb6c9536f604ca89e3c002+53")
+       c.Check(outcoll.ManifestText, check.Matches, `\. d41d8.* 0:0:hello\\040world 0:0:ohai\n`)
+       c.Check(outcoll.PortableDataHash, check.Equals, "8fa5dee9231a724d7cf377c5a2f4907c+65")
 }
 
 func (s *IntegrationSuite) runContainer(c *check.C, clusterID string, ctrSpec map[string]interface{}, expectExitCode int) arvados.Collection {
@@ -1148,15 +1148,14 @@ func (s *IntegrationSuite) runContainer(c *check.C, clusterID string, ctrSpec ma
 
        c.Log("[docker load]")
        out, err := exec.Command("docker", "load", "--input", arvadostest.BusyboxDockerImage(c)).CombinedOutput()
-       c.Logf("[docker load done] %s", out)
+       c.Logf("[docker load output] %s", out)
        c.Check(err, check.IsNil)
 
        c.Log("[arv-keepdocker]")
        akd := exec.Command("arv-keepdocker", "--no-resume", "busybox:uclibc")
        akd.Env = append(os.Environ(), "ARVADOS_API_HOST="+ac.APIHost, "ARVADOS_API_HOST_INSECURE=1", "ARVADOS_API_TOKEN="+ac.AuthToken)
-       c.Logf("[arv-keepdocker env] %q", akd.Env)
        out, err = akd.CombinedOutput()
-       c.Logf("[arv-keepdocker done] %s", out)
+       c.Logf("[arv-keepdocker output]\n%s", out)
        c.Check(err, check.IsNil)
 
        var cr arvados.ContainerRequest