GitList

Browse code

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] https://github.com/opencontainers/runc/pull/2441

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 56de0489fc7d5ec498ee5545d50b0e770a7ca339)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Kir Kolyshkin authored on 2020/06/10 06:19:14
Showing 1 changed files

integration-cli/docker_cli_run_unix_test.go

History View file @ 5fce12c

@@ -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))
+                     }