From f3946c14fef1991cfbb86b2a480136707328b08b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Mon, 13 Mar 2023 13:57:34 +0100 Subject: [PATCH] integration-cli: Enable TestExecStartFails on Windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Paweł Gronowski (cherry picked from commit be34e93f2018e121a5539b5f8b830615c2347fc2) Signed-off-by: Paweł Gronowski --- integration-cli/docker_cli_exec_test.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/integration-cli/docker_cli_exec_test.go b/integration-cli/docker_cli_exec_test.go index 2dc1ad942c..b7cfb10d52 100644 --- a/integration-cli/docker_cli_exec_test.go +++ b/integration-cli/docker_cli_exec_test.go @@ -509,16 +509,18 @@ func (s *DockerCLIExecSuite) TestExecUlimits(c *testing.T) { // #15750 func (s *DockerCLIExecSuite) TestExecStartFails(c *testing.T) { - // TODO Windows CI. This test should be portable. Figure out why it fails - // currently. - testRequires(c, DaemonIsLinux) name := "exec-15750" runSleepingContainer(c, "-d", "--name", name) assert.NilError(c, waitRun(name)) out, _, err := dockerCmdWithError("exec", name, "no-such-cmd") assert.ErrorContains(c, err, "", out) - assert.Assert(c, strings.Contains(out, "executable file not found")) + + expectedMsg := "executable file not found" + if DaemonIsWindows() { + expectedMsg = "The system cannot find the file specified" + } + assert.Assert(c, is.Contains(out, expectedMsg)) } // Fix regression in https://github.com/docker/docker/pull/26461#issuecomment-250287297