From: Tom Clegg <tom@curii.com>
Date: Mon, 16 May 2022 18:24:02 +0000 (-0400)
Subject: 19099: Skip IPAddress test if it looks like we can't use --fakeroot.
X-Git-Tag: 2.5.0~163^2~2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/554dc3c84338223df363a05a215919f7af90fc6a

19099: Skip IPAddress test if it looks like we can't use --fakeroot.

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

diff --git a/lib/crunchrun/singularity_test.go b/lib/crunchrun/singularity_test.go
index 2bad082baa..7e5819bb48 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{})
@@ -39,6 +41,11 @@ func (s *singularitySuite) TestIPAddress(c *C) {
 	// 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)
 }