Merge branch '11629-groups-contents-memory'

[arvados.git] / services / crunch-run / crunchrun_test.go

diff --git a/services/crunch-run/crunchrun_test.go b/services/crunch-run/crunchrun_test.go
index a78eb63defa1201351884a57f509bc1d1b57fe08..c8427563cb9447ceada0af2d44a3ef30586672ab 100644 (file)
--- a/services/crunch-run/crunchrun_test.go
+++ b/services/crunch-run/crunchrun_test.go
@@ -103,10 +103,6 @@ func (m *MockConn) Write(b []byte) (int, error) {
        return len(b), nil
 }
 
-func (m *MockConn) Close() error {
-       return nil
-}
-
 func NewMockConn() *MockConn {
        c := &MockConn{}
        return c
@@ -253,7 +249,16 @@ func (client *ArvTestClient) Update(resourceType string, uuid string, parameters
        return nil
 }
 
-var discoveryMap = map[string]interface{}{"defaultTrashLifetime": float64(1209600)}
+var discoveryMap = map[string]interface{}{
+       "defaultTrashLifetime":               float64(1209600),
+       "crunchLimitLogBytesPerJob":          float64(67108864),
+       "crunchLogThrottleBytes":             float64(65536),
+       "crunchLogThrottlePeriod":            float64(60),
+       "crunchLogThrottleLines":             float64(1024),
+       "crunchLogPartialLineThrottlePeriod": float64(5),
+       "crunchLogBytesPerEvent":             float64(4096),
+       "crunchLogSecondsBetweenEvents":      float64(1),
+}
 
 func (client *ArvTestClient) Discovery(key string) (interface{}, error) {
        return discoveryMap[key], nil
@@ -972,6 +977,22 @@ func (s *TestSuite) TestSetupMounts(c *C) {
                checkEmpty()
        }
 
+       {
+               i = 0
+               cr.ArvMountPoint = ""
+               cr.Container.Mounts = make(map[string]arvados.Mount)
+               cr.Container.Mounts["/out"] = arvados.Mount{Kind: "tmp"}
+               cr.Container.Mounts["/tmp"] = arvados.Mount{Kind: "tmp"}
+               cr.OutputPath = "/out"
+
+               err := cr.SetupMounts()
+               c.Check(err, IsNil)
+               c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", "--read-write", "--mount-by-pdh", "by_id", realTemp + "/keep1"})
+               c.Check(cr.Binds, DeepEquals, []string{realTemp + "/2:/out", realTemp + "/3:/tmp"})
+               cr.CleanupDirs()
+               checkEmpty()
+       }
+
        {
                i = 0
                cr.ArvMountPoint = ""