Commit 75176947 authored by Jess Frazelle's avatar Jess Frazelle Committed by Brad Fitzpatrick

syscall: fix TestGroupCleanup{UserNamespace} on Alpine

This updates TestGroupCleanup and TestGroupCleanupUserNamespace to pass in the
Alpine builder.

Updates #19938

Change-Id: Iacbfd73782eccd57f872f9e85726c6024529c277
Reviewed-on: https://go-review.googlesource.com/40692Reviewed-by: default avatarDaniel Martí <mvdan@mvdan.cc>
Reviewed-by: default avatarBrad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Daniel Martí <mvdan@mvdan.cc>
TryBot-Result: Gobot Gobot <gobot@golang.org>
parent f75b5e99
...@@ -207,9 +207,10 @@ func TestGroupCleanup(t *testing.T) { ...@@ -207,9 +207,10 @@ func TestGroupCleanup(t *testing.T) {
t.Fatalf("Cmd failed with err %v, output: %s", err, out) t.Fatalf("Cmd failed with err %v, output: %s", err, out)
} }
strOut := strings.TrimSpace(string(out)) strOut := strings.TrimSpace(string(out))
expected := "uid=0(root) gid=0(root) groups=0(root)" expected := "uid=0(root) gid=0(root)"
// Just check prefix because some distros reportedly output a // Just check prefix because some distros reportedly output a
// context parameter; see https://golang.org/issue/16224. // context parameter; see https://golang.org/issue/16224.
// Alpine does not output groups; see https://golang.org/issue/19938.
if !strings.HasPrefix(strOut, expected) { if !strings.HasPrefix(strOut, expected) {
t.Errorf("id command output: %q, expected prefix: %q", strOut, expected) t.Errorf("id command output: %q, expected prefix: %q", strOut, expected)
} }
...@@ -247,6 +248,7 @@ func TestGroupCleanupUserNamespace(t *testing.T) { ...@@ -247,6 +248,7 @@ func TestGroupCleanupUserNamespace(t *testing.T) {
"uid=0(root) gid=0(root) groups=0(root),65534(nobody)", "uid=0(root) gid=0(root) groups=0(root),65534(nobody)",
"uid=0(root) gid=0(root) groups=0(root),65534(nogroup)", "uid=0(root) gid=0(root) groups=0(root),65534(nogroup)",
"uid=0(root) gid=0(root) groups=0(root),65534", "uid=0(root) gid=0(root) groups=0(root),65534",
"uid=0(root) gid=0(root) groups=0(root),65534(nobody),65534(nobody),65534(nobody),65534(nobody),65534(nobody),65534(nobody),65534(nobody),65534(nobody),65534(nobody),65534(nobody)", // Alpine; see https://golang.org/issue/19938
} }
for _, e := range expected { for _, e := range expected {
if strOut == e { if strOut == e {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment