From: Tom Clegg <tom@curii.com>
Date: Tue, 31 May 2022 14:27:00 +0000 (-0400)
Subject: 15370: Ensure keep data dirs exists for test.
X-Git-Tag: 2.5.0~142^2~2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/4ac7c5a26e9d5ba203edeaed242627be2bf9dbf8?ds=sidebyside

15370: Ensure keep data dirs exists for test.

...instead of assuming some other test suite has created them by
calling arvadostest.StartKeep().

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

diff --git a/lib/crunchrun/integration_test.go b/lib/crunchrun/integration_test.go
index a9a270b07b..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"
 )
 
@@ -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