Merge pull request #37440 from msabansal/errorfix

Fix error string in docker CLI test
This commit is contained in:
Sebastiaan van Stijn 2018-07-12 13:47:47 +02:00 committed by GitHub
commit 460297b5fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -3948,6 +3948,7 @@ func (s *DockerSuite) TestRunAttachFailedNoLeak(c *check.C) {
// TODO Windows Post TP5. Fix the error message string
c.Assert(strings.Contains(string(out), "port is already allocated") ||
strings.Contains(string(out), "were not connected because a duplicate name exists") ||
strings.Contains(string(out), "The specified port already exists") ||
strings.Contains(string(out), "HNS failed with error : Failed to create endpoint") ||
strings.Contains(string(out), "HNS failed with error : The object already exists"), checker.Equals, true, check.Commentf("Output: %s", out))
dockerCmd(c, "rm", "-f", "test")