Merge branch '15370-loopback-dispatchcloud'

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

diff --git a/lib/crunchrun/integration_test.go b/lib/crunchrun/integration_test.go
index 96ba576a491a8692b5dc7b89fb268fe5c9402e46..3f7c7e50f14f7713c0de4885f0cae4fd64ab11f8 100644 (file)
--- 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"
 )
 
@@ -193,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
 
@@ -222,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)
@@ -249,9 +258,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)