X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1e07f4413aa4d3e574502fd2efe89cd295649300..4ac7c5a26e9d5ba203edeaed242627be2bf9dbf8:/lib/crunchrun/integration_test.go

diff --git a/lib/crunchrun/integration_test.go b/lib/crunchrun/integration_test.go
index 0b139dd97d..3f7c7e50f1 100644
--- a/lib/crunchrun/integration_test.go
+++ b/lib/crunchrun/integration_test.go
@@ -20,6 +20,7 @@ import (
 	"git.arvados.org/arvados.git/sdk/go/arvadostest"
 	"git.arvados.org/arvados.git/sdk/go/ctxlog"
 	"git.arvados.org/arvados.git/sdk/go/keepclient"
+	"git.arvados.org/arvados.git/services/keepstore"
 	. "gopkg.in/check.v1"
 )
 
@@ -51,7 +52,7 @@ func (s *integrationSuite) SetUpSuite(c *C) {
 
 	arvadostest.StartKeep(2, true)
 
-	out, err := exec.Command("docker", "load", "--input", busyboxDockerImage(c)).CombinedOutput()
+	out, err := exec.Command("docker", "load", "--input", arvadostest.BusyboxDockerImage(c)).CombinedOutput()
 	c.Log(string(out))
 	c.Assert(err, IsNil)
 	out, err = exec.Command("arv-keepdocker", "--no-resume", "busybox:uclibc").Output()
@@ -162,11 +163,13 @@ func (s *integrationSuite) setup(c *C) {
 func (s *integrationSuite) TestRunTrivialContainerWithDocker(c *C) {
 	s.engine = "docker"
 	s.testRunTrivialContainer(c)
+	c.Check(s.logFiles["crunch-run.txt"], Matches, `(?ms).*Using container runtime: docker Engine \d+\.\d+.*`)
 }
 
 func (s *integrationSuite) TestRunTrivialContainerWithSingularity(c *C) {
 	s.engine = "singularity"
 	s.testRunTrivialContainer(c)
+	c.Check(s.logFiles["crunch-run.txt"], Matches, `(?ms).*Using container runtime: singularity.* version 3\.\d+.*`)
 }
 
 func (s *integrationSuite) TestRunTrivialContainerWithLocalKeepstore(c *C) {
@@ -191,6 +194,14 @@ func (s *integrationSuite) TestRunTrivialContainerWithLocalKeepstore(c *C) {
 			volume.AccessViaHosts = nil
 			volume.Replication = 2
 			cluster.Volumes[uuid] = volume
+
+			var v keepstore.UnixVolume
+			err = json.Unmarshal(volume.DriverParameters, &v)
+			c.Assert(err, IsNil)
+			err = os.Mkdir(v.Root, 0777)
+			if !os.IsExist(err) {
+				c.Assert(err, IsNil)
+			}
 		}
 		cluster.Containers.LocalKeepLogsToContainerLog = trial.logConfig
 
@@ -220,7 +231,7 @@ func (s *integrationSuite) TestRunTrivialContainerWithLocalKeepstore(c *C) {
 	s.SetUpTest(c)
 	s.stdin.Reset()
 	s.testRunTrivialContainer(c)
-	c.Check(s.logFiles["crunch-run.txt"], Matches, `(?ms).*not starting a local keepstore process because a volume \(zzzzz-nyw5e-000000000000000\) uses AccessViaHosts\n.*`)
+	c.Check(s.logFiles["crunch-run.txt"], Matches, `(?ms).*not starting a local keepstore process because a volume \(zzzzz-nyw5e-00000000000000\d\) uses AccessViaHosts\n.*`)
 
 	// Check that config read errors are logged
 	s.SetUpTest(c)