beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix remaining compile issues

Browse source 
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 318b1612e1)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Tibor Vass 2019-08-26 14:45:33 +00:00 committed by Sebastiaan van Stijn
parent be66788e3c
commit c30d52b829
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
integration-cli/docker_cli_run_test.go
View file

@ -24,7 +24,6 @@ import (
"time"
"github.com/docker/docker/client"
"github.com/docker/docker/integration-cli/checker"
"github.com/docker/docker/integration-cli/cli"
"github.com/docker/docker/integration-cli/cli/build"
"github.com/docker/docker/internal/test/fakecontext"
@ -3952,7 +3951,7 @@ func (s *DockerSuite) TestRunAttachFailedNoLeak(c *testing.T) {
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, fmt.Sprintf("Output: %s", out))
strings.Contains(string(out), "HNS failed with error : The object already exists"), fmt.Sprintf("Output: %s", out))
dockerCmd(c, "rm", "-f", "test")
// NGoroutines is not updated right away, so we need to wait before failing

8
integration-cli/docker_utils_test.go
View file

@ -430,8 +430,8 @@ func waitAndAssert(t assert.TestingT, timeout time.Duration, f checkF, compariso
default:
}
if shouldAssert {
if comment != nil {
args = append(args, comment.CheckCommentString())
if len(comment) > 0 {
args = append(args, comment)
}
assert.Assert(t, comparison, args...)
return
@ -450,8 +450,8 @@ func reducedCheck(r reducer, funcs ...checkF) checkF {
for _, f := range funcs {
v, comment := f(c)
values = append(values, v)
if comment != nil {
comments = append(comments, comment.CheckCommentString())
if len(comment) > 0 {
comments = append(comments, comment)
}
}
return r(values...), fmt.Sprintf("%v", strings.Join(comments, ", "))