Merge pull request #19847 from Microsoft/jjh/revert19790

Revert PR 19790 (breaks windowsTP4 CI on cache bust)
Upstream-commit: 5f5a752bcf687aab0120e6c7903922ff01371ec0
Component: engine

components/engine/integration-cli/docker_cli_run_test.go

@@ -1724,7 +1724,7 @@ func (s *DockerSuite) TestRunWorkdirExistsAndIsFile(c *check.C) {
 	expected := "Cannot mkdir: /bin/cat is not a directory"
 	if daemonPlatform == "windows" {
 		existingFile = `\windows\system32\ntdll.dll`
-		expected = `Cannot mkdir: \windows\system32\ntdll.dll is not a directory.`
+		expected = "The directory name is invalid"
 	}
 
 	out, exitCode, err := dockerCmdWithError("run", "-w", existingFile, "busybox")