[ARVADOS] updated: 2.1.0-1381-gf6ea17a26

[Git user]

Summary of changes:
 lib/crunchrun/crunchrun_test.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

       via  f6ea17a260b2660b69b5e75103efdd6e51f75201 (commit)
      from  ce84723a4704a766f7e0dc3c61896733bf94f838 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit f6ea17a260b2660b69b5e75103efdd6e51f75201
Author: Tom Clegg <tom at curii.com>
Date:   Wed Sep 22 14:06:06 2021 -0400

    8363: Update tests.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/crunchrun/crunchrun_test.go b/lib/crunchrun/crunchrun_test.go
index 8434e5311..53e1bed83 100644
--- a/lib/crunchrun/crunchrun_test.go
+++ b/lib/crunchrun/crunchrun_test.go
@@ -1103,7 +1103,7 @@ func (s *TestSuite) TestSetupMounts(c *C) {
 		cr.statInterval = 5 * time.Second
 		bindmounts, err := cr.SetupMounts()
 		c.Check(err, IsNil)
-		c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other",
+		c.Check(am.Cmd, DeepEquals, []string{"arv-mount", "--foreground", "--allow-other",
 			"--read-write", "--storage-classes", "default", "--crunchstat-interval=5",
 			"--mount-by-pdh", "by_id", "--mount-by-id", "by_uuid", realTemp + "/keep1"})
 		c.Check(bindmounts, DeepEquals, map[string]bindmount{"/tmp": {realTemp + "/tmp2", false}})
@@ -1123,7 +1123,7 @@ func (s *TestSuite) TestSetupMounts(c *C) {
 
 		bindmounts, err := cr.SetupMounts()
 		c.Check(err, IsNil)
-		c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other",
+		c.Check(am.Cmd, DeepEquals, []string{"arv-mount", "--foreground", "--allow-other",
 			"--read-write", "--storage-classes", "foo,bar", "--crunchstat-interval=5",
 			"--mount-by-pdh", "by_id", "--mount-by-id", "by_uuid", realTemp + "/keep1"})
 		c.Check(bindmounts, DeepEquals, map[string]bindmount{"/out": {realTemp + "/tmp2", false}, "/tmp": {realTemp + "/tmp3", false}})
@@ -1143,7 +1143,7 @@ func (s *TestSuite) TestSetupMounts(c *C) {
 
 		bindmounts, err := cr.SetupMounts()
 		c.Check(err, IsNil)
-		c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other",
+		c.Check(am.Cmd, DeepEquals, []string{"arv-mount", "--foreground", "--allow-other",
 			"--read-write", "--storage-classes", "default", "--crunchstat-interval=5",
 			"--mount-by-pdh", "by_id", "--mount-by-id", "by_uuid", realTemp + "/keep1"})
 		c.Check(bindmounts, DeepEquals, map[string]bindmount{"/tmp": {realTemp + "/tmp2", false}, "/etc/arvados/ca-certificates.crt": {stubCertPath, true}})
@@ -1166,7 +1166,7 @@ func (s *TestSuite) TestSetupMounts(c *C) {
 
 		bindmounts, err := cr.SetupMounts()
 		c.Check(err, IsNil)
-		c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other",
+		c.Check(am.Cmd, DeepEquals, []string{"arv-mount", "--foreground", "--allow-other",
 			"--read-write", "--storage-classes", "default", "--crunchstat-interval=5",
 			"--mount-tmp", "tmp0", "--mount-by-pdh", "by_id", "--mount-by-id", "by_uuid", realTemp + "/keep1"})
 		c.Check(bindmounts, DeepEquals, map[string]bindmount{"/keeptmp": {realTemp + "/keep1/tmp0", false}})
@@ -1189,7 +1189,7 @@ func (s *TestSuite) TestSetupMounts(c *C) {
 
 		bindmounts, err := cr.SetupMounts()
 		c.Check(err, IsNil)
-		c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other",
+		c.Check(am.Cmd, DeepEquals, []string{"arv-mount", "--foreground", "--allow-other",
 			"--read-write", "--storage-classes", "default", "--crunchstat-interval=5",
 			"--mount-tmp", "tmp0", "--mount-by-pdh", "by_id", "--mount-by-id", "by_uuid", realTemp + "/keep1"})
 		c.Check(bindmounts, DeepEquals, map[string]bindmount{
@@ -1216,7 +1216,7 @@ func (s *TestSuite) TestSetupMounts(c *C) {
 
 		bindmounts, err := cr.SetupMounts()
 		c.Check(err, IsNil)
-		c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other",
+		c.Check(am.Cmd, DeepEquals, []string{"arv-mount", "--foreground", "--allow-other",
 			"--read-write", "--storage-classes", "default", "--crunchstat-interval=5",
 			"--file-cache", "512", "--mount-tmp", "tmp0", "--mount-by-pdh", "by_id", "--mount-by-id", "by_uuid", realTemp + "/keep1"})
 		c.Check(bindmounts, DeepEquals, map[string]bindmount{
@@ -1299,7 +1299,7 @@ func (s *TestSuite) TestSetupMounts(c *C) {
 
 		bindmounts, err := cr.SetupMounts()
 		c.Check(err, IsNil)
-		c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other",
+		c.Check(am.Cmd, DeepEquals, []string{"arv-mount", "--foreground", "--allow-other",
 			"--read-write", "--storage-classes", "default", "--crunchstat-interval=5",
 			"--file-cache", "512", "--mount-tmp", "tmp0", "--mount-by-pdh", "by_id", "--mount-by-id", "by_uuid", realTemp + "/keep1"})
 		c.Check(bindmounts, DeepEquals, map[string]bindmount{

-----------------------------------------------------------------------


hooks/post-receive
--