Browse code

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 authored on 2020/06/18 02:38:05
Showing 1 changed files
... ...
@@ -765,7 +765,7 @@ func (s *DockerSuite) TestRunInvalidCPUShares(c *testing.T) {
765 765
 	testRequires(c, cpuShare, DaemonIsLinux)
766 766
 	out, _, err := dockerCmdWithError("run", "--cpu-shares", "1", "busybox", "echo", "test")
767 767
 	assert.ErrorContains(c, err, "", out)
768
-	expected := "The minimum allowed cpu-shares is 2"
768
+	expected := "minimum allowed cpu-shares is 2"
769 769
 	assert.Assert(c, strings.Contains(out, expected))
770 770
 
771 771
 	out, _, err = dockerCmdWithError("run", "--cpu-shares", "-1", "busybox", "echo", "test")
... ...
@@ -775,7 +775,7 @@ func (s *DockerSuite) TestRunInvalidCPUShares(c *testing.T) {
775 775
 
776 776
 	out, _, err = dockerCmdWithError("run", "--cpu-shares", "99999999", "busybox", "echo", "test")
777 777
 	assert.ErrorContains(c, err, "", out)
778
-	expected = "The maximum allowed cpu-shares is"
778
+	expected = "maximum allowed cpu-shares is"
779 779
 	assert.Assert(c, strings.Contains(out, expected))
780 780
 }
781 781