소스 검색

Merge pull request #41088 from thaJeztah/19.03_backport_invalid_cpu_shares_fix

[19.03 backport] int-cli/TestRunInvalidCPUShares: fix for newer runc
Tibor Vass 5 년 전
부모
커밋
abb5beffff
1개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 2
      integration-cli/docker_cli_run_unix_test.go

+ 2 - 2
integration-cli/docker_cli_run_unix_test.go

@@ -765,7 +765,7 @@ func (s *DockerSuite) TestRunInvalidCPUShares(c *testing.T) {
 	testRequires(c, cpuShare, DaemonIsLinux)
 	out, _, err := dockerCmdWithError("run", "--cpu-shares", "1", "busybox", "echo", "test")
 	assert.ErrorContains(c, err, "", out)
-	expected := "The minimum allowed cpu-shares is 2"
+	expected := "minimum allowed cpu-shares is 2"
 	assert.Assert(c, strings.Contains(out, expected))
 
 	out, _, err = dockerCmdWithError("run", "--cpu-shares", "-1", "busybox", "echo", "test")
@@ -775,7 +775,7 @@ func (s *DockerSuite) TestRunInvalidCPUShares(c *testing.T) {
 
 	out, _, err = dockerCmdWithError("run", "--cpu-shares", "99999999", "busybox", "echo", "test")
 	assert.ErrorContains(c, err, "", out)
-	expected = "The maximum allowed cpu-shares is"
+	expected = "maximum allowed cpu-shares is"
 	assert.Assert(c, strings.Contains(out, expected))
 }