X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/fd178c88e1f61ca4e809073ee5baafa26986eb59..469ea187586ea8017e26874c2d80414ce7571fae:/lib/crunchrun/singularity_test.go

diff --git a/lib/crunchrun/singularity_test.go b/lib/crunchrun/singularity_test.go
index bad2abef33..e4c7cdb308 100644
--- a/lib/crunchrun/singularity_test.go
+++ b/lib/crunchrun/singularity_test.go
@@ -5,9 +5,11 @@
 package crunchrun
 
 import (
+	"os"
 	"os/exec"
 
 	. "gopkg.in/check.v1"
+	check "gopkg.in/check.v1"
 )
 
 var _ = Suite(&singularitySuite{})
@@ -28,6 +30,34 @@ func (s *singularitySuite) SetUpSuite(c *C) {
 	}
 }
 
+func (s *singularitySuite) TearDownSuite(c *C) {
+	if s.executor != nil {
+		s.executor.Close()
+	}
+}
+
+func (s *singularitySuite) TestIPAddress(c *C) {
+	// In production, executor will choose --network=bridge
+	// because uid=0 under arvados-dispatch-cloud. But in test
+	// cases, uid!=0, which means --network=bridge is conditional
+	// on --fakeroot.
+	uuc, err := os.ReadFile("/proc/sys/kernel/unprivileged_userns_clone")
+	c.Check(err, check.IsNil)
+	if string(uuc) == "0\n" {
+		c.Skip("insufficient privileges to run this test case -- `singularity exec --fakeroot` requires /proc/sys/kernel/unprivileged_userns_clone = 1")
+	}
+	s.executor.(*singularityExecutor).fakeroot = true
+	s.executorSuite.TestIPAddress(c)
+}
+
+func (s *singularitySuite) TestInject(c *C) {
+	path, err := exec.LookPath("nsenter")
+	if err != nil || path != "/var/lib/arvados/bin/nsenter" {
+		c.Skip("looks like /var/lib/arvados/bin/nsenter is not installed -- re-run `arvados-server install`?")
+	}
+	s.executorSuite.TestInject(c)
+}
+
 var _ = Suite(&singularityStubSuite{})
 
 // singularityStubSuite tests don't really invoke singularity, so we
@@ -47,6 +77,6 @@ func (s *singularityStubSuite) TestSingularityExecArgs(c *C) {
 	c.Check(err, IsNil)
 	e.imageFilename = "/fake/image.sif"
 	cmd := e.execCmd("./singularity")
-	c.Check(cmd.Args, DeepEquals, []string{"./singularity", "exec", "--containall", "--cleanenv", "--pwd", "/WorkingDir", "--net", "--network=none", "--nv", "--bind", "/hostpath:/mnt:ro", "/fake/image.sif"})
+	c.Check(cmd.Args, DeepEquals, []string{"./singularity", "exec", "--containall", "--cleanenv", "--pwd=/WorkingDir", "--net", "--network=none", "--nv", "--bind", "/hostpath:/mnt:ro", "/fake/image.sif"})
 	c.Check(cmd.Env, DeepEquals, []string{"SINGULARITYENV_FOO=bar", "SINGULARITY_NO_EVAL=1"})
 }