Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit 8021269

Browse files
kolyshkinthaJeztah
authored andcommitted
int-cli/TestRunInvalidCPUShares: fix for newer runc
A newer runc changed [1] a couple of certain error messages checked in this test to be lowercased, which lead to a mismatch in this test case. Fix is to remove "The" (which was replaced with "the"). [1] opencontainers/runc#2441 Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit 56de0489fc7d5ec498ee5545d50b0e770a7ca339) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 5fce12cf2559b1e0dacd9785190c73f0e689767b Component: engine
1 parent f1aa3ee commit 8021269

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

components/engine/integration-cli/docker_cli_run_unix_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -765,7 +765,7 @@ func (s *DockerSuite) TestRunInvalidCPUShares(c *testing.T) {
765765
testRequires(c, cpuShare, DaemonIsLinux)
766766
out, _, err := dockerCmdWithError("run", "--cpu-shares", "1", "busybox", "echo", "test")
767767
assert.ErrorContains(c, err, "", out)
768-
expected := "The minimum allowed cpu-shares is 2"
768+
expected := "minimum allowed cpu-shares is 2"
769769
assert.Assert(c, strings.Contains(out, expected))
770770

771771
out, _, err = dockerCmdWithError("run", "--cpu-shares", "-1", "busybox", "echo", "test")
@@ -775,7 +775,7 @@ func (s *DockerSuite) TestRunInvalidCPUShares(c *testing.T) {
775775

776776
out, _, err = dockerCmdWithError("run", "--cpu-shares", "99999999", "busybox", "echo", "test")
777777
assert.ErrorContains(c, err, "", out)
778-
expected = "The maximum allowed cpu-shares is"
778+
expected = "maximum allowed cpu-shares is"
779779
assert.Assert(c, strings.Contains(out, expected))
780780
}
781781

0 commit comments

Comments
 (0)