15370: Fix up debug logs.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/lib/controller/integration_test.go b/lib/controller/integration_test.go
index 7bf739f902edcbc0ec8a220590dad40ff0302d93..67d60197e7e160b5f7d99e510106a55a18ffd07f 100644 (file)
--- a/lib/controller/integration_test.go
+++ b/lib/controller/integration_test.go
@@ -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.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.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()
        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
        c.Check(err, check.IsNil)
 
        var cr arvados.ContainerRequest