Merge pull request #3717 from dtrudg/issue-3715

dtrudg · web-flow · commit c45b6dff4672 · 2025-06-20T16:11:58.000+01:00
e2e: fix: accommodate "Super User" in e2e CustomHomePreservesRootShell
diff --git a/e2e/actions/actions.go b/e2e/actions/actions.go
@@ -340,7 +340,7 @@ func (c actionTests) actionExecMultiProfile(t *testing.T) {
 					argv: []string{"--home", "/tmp", c.env.ImagePath, "cat", "/etc/passwd"},
 					exit: 0,
 					wantOutputs: []e2e.SingularityCmdResultOp{
-						e2e.ExpectOutput(e2e.RegexMatch, `^root:x:0:0:\w*:[^:]*:/bin/ash\n`),
+						e2e.ExpectOutput(e2e.RegexMatch, `^root:x:0:0:[^:]*:[^:]*:/bin/ash\n`),
 					},
 				},
 			}
diff --git a/e2e/actions/oci.go b/e2e/actions/oci.go
@@ -308,7 +308,7 @@ func (c actionTests) actionOciExec(t *testing.T) {
 			argv: []string{"--home", "/tmp", imageRef, "cat", "/etc/passwd"},
 			exit: 0,
 			wantOutputs: []e2e.SingularityCmdResultOp{
-				e2e.ExpectOutput(e2e.RegexMatch, `^root:x:0:0:\w*:[^:]*:/bin/ash\n`),
+				e2e.ExpectOutput(e2e.RegexMatch, `^root:x:0:0:[^:]*:[^:]*:/bin/ash\n`),
 			},
 		},
 		{

Original file line number	Diff line number	Diff line change
`@@ -340,7 +340,7 @@ func (c actionTests) actionExecMultiProfile(t *testing.T) {`
`340`	`340`	`argv: []string{"--home", "/tmp", c.env.ImagePath, "cat", "/etc/passwd"},`
`341`	`341`	`exit: 0,`
`342`	`342`	`wantOutputs: []e2e.SingularityCmdResultOp{`
`343`		- e2e.ExpectOutput(e2e.RegexMatch, `^root:x:0:0:\w:[^:]:/bin/ash\n`),
	`343`	+ e2e.ExpectOutput(e2e.RegexMatch, `^root:x:0:0:[^:]:[^:]:/bin/ash\n`),
`344`	`344`	`},`
`345`	`345`	`},`
`346`	`346`	`}`
Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,7 @@ func (c actionTests) actionOciExec(t *testing.T) {`
`308`	`308`	`argv: []string{"--home", "/tmp", imageRef, "cat", "/etc/passwd"},`
`309`	`309`	`exit: 0,`
`310`	`310`	`wantOutputs: []e2e.SingularityCmdResultOp{`
`311`		- e2e.ExpectOutput(e2e.RegexMatch, `^root:x:0:0:\w:[^:]:/bin/ash\n`),
	`311`	+ e2e.ExpectOutput(e2e.RegexMatch, `^root:x:0:0:[^:]:[^:]:/bin/ash\n`),
`312`	`312`	`},`
`313`	`313`	`},`
`314`	`314`	`{`