X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4b593edcfee19c464e10baacd68fb267c7f22450..2e74236fa27822addd856f194befc28382990ce0:/lib/crunchrun/integration_test.go

diff --git a/lib/crunchrun/integration_test.go b/lib/crunchrun/integration_test.go
index 2ba7556cb5..a9a270b07b 100644
--- a/lib/crunchrun/integration_test.go
+++ b/lib/crunchrun/integration_test.go
@@ -51,7 +51,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()
@@ -222,7 +222,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)
@@ -249,9 +249,6 @@ func (s *integrationSuite) testRunTrivialContainer(c *C) {
 	if err := exec.Command("which", s.engine).Run(); err != nil {
 		c.Skip(fmt.Sprintf("%s: %s", s.engine, err))
 	}
-	if s.engine == "docker" && os.Getenv("ENABLE_DOCKER_TESTS") == "" {
-		c.Skip("docker tests temporarily disabled if ENABLE_DOCKER_TESTS is not set, see https://dev.arvados.org/issues/15370#note-31")
-	}
 	s.cr.Command = []string{"sh", "-c", "cat /mnt/in/inputfile >/mnt/out/inputfile && cat /mnt/json >/mnt/out/json && ! touch /mnt/in/shouldbereadonly && mkdir /mnt/out/emptydir"}
 	s.setup(c)