1. docker
  2. Commit c7e77dba7ff1e512d702dc434d8d2bb956d80f47
Browse code

Update some tests for supplementary group permissions

Update tests checking for groups to adjust for new policy updated in
de7af816e76a7fd3fbf06bffa6832959289fba32, which caused those tests
to fail:

=== FAIL: amd64.integration-cli TestDockerSwarmSuite/TestSwarmServiceWithGroup (1.94s)
docker_cli_swarm_test.go:311: assertion failed: uid=0(root) gid=0(root) groups=0(root),10(wheel),29(audio),50(staff),777 (string) != uid=0(root) gid=0(root) groups=10(wheel),29(audio),50(staff),777
(string)
--- FAIL: TestDockerSwarmSuite/TestSwarmServiceWithGroup (1.94s)

=== FAIL: amd64.integration-cli TestDockerCLIRunSuite/TestRunGroupAdd (0.41s)
docker_cli_run_test.go:1091: expected output uid=0(root) gid=0(root) groups=10(wheel),29(audio),50(staff),777 received uid=0(root) gid=0(root) groups=0(root),10(wheel),29(audio),50(staff),777
--- FAIL: TestDockerCLIRunSuite/TestRunGroupAdd (0.41s)

=== FAIL: amd64.integration-cli TestDockerCLIRunSuite/TestRunUserByIDZero (0.41s)
docker_cli_run_test.go:790: expected daemon user got uid=0(root) gid=0(root) groups=0(root),10(wheel)
--- FAIL: TestDockerCLIRunSuite/TestRunUserByIDZero (0.41s)

=== FAIL: amd64.integration-cli TestDockerCLIRunSuite (195.70s)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2022/09/09 06:27:59
Showing 2 changed files
integration-cli/docker_cli_run_test.go
History View file @ c7e77db
... ... 
@@ -786,7 +786,7 @@ func (s *DockerCLIRunSuite) TestRunUserByIDZero(c *testing.T) {
786 786 
 	if err != nil {
787 787 
 		c.Fatal(err, out)
788 788 
 	}
789 
-	if !strings.Contains(out, "uid=0(root) gid=0(root) groups=10(wheel)") {
789 
+	if !strings.Contains(out, "uid=0(root) gid=0(root) groups=0(root),10(wheel)") {
790 790 
 		c.Fatalf("expected daemon user got %s", out)
791 791 
 	}
792 792 
 }
... ... 
@@ -1086,7 +1086,7 @@ func (s *DockerCLIRunSuite) TestRunGroupAdd(c *testing.T) {
1086 1086 
 	testRequires(c, DaemonIsLinux)
1087 1087 
 	out, _ := dockerCmd(c, "run", "--group-add=audio", "--group-add=staff", "--group-add=777", "busybox", "sh", "-c", "id")
1088 1088
1089 
-	groupsList := "uid=0(root) gid=0(root) groups=10(wheel),29(audio),50(staff),777"
1089 
+	groupsList := "uid=0(root) gid=0(root) groups=0(root),10(wheel),29(audio),50(staff),777"
1090 1090 
 	if actual := strings.Trim(out, "\r\n"); actual != groupsList {
1091 1091 
 		c.Fatalf("expected output %s received %s", groupsList, actual)
1092 1092 
 	}
integration-cli/docker_cli_swarm_test.go
History View file @ c7e77db
... ... 
@@ -308,7 +308,7 @@ func (s *DockerSwarmSuite) TestSwarmServiceWithGroup(c *testing.T) {
308 308
309 309 
 	out, err = d.Cmd("exec", container, "id")
310 310 
 	assert.NilError(c, err, out)
311 
-	assert.Equal(c, strings.TrimSpace(out), "uid=0(root) gid=0(root) groups=10(wheel),29(audio),50(staff),777")
311 
+	assert.Equal(c, strings.TrimSpace(out), "uid=0(root) gid=0(root) groups=0(root),10(wheel),29(audio),50(staff),777")
312 312 
 }
313 313
314 314 
 func (s *DockerSwarmSuite) TestSwarmContainerAutoStart(c *testing.T) {