Merge pull request #38515 from yongtang/01082019-oll.WaitOn

Use poll.WaitOn in authz_plugin_test.go
This commit is contained in:
Sebastiaan van Stijn 2019-01-09 16:10:52 +01:00 committed by GitHub
commit 3f2ecb5452
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 12 deletions

View File

@ -26,6 +26,7 @@ import (
"github.com/docker/docker/pkg/archive"
"github.com/docker/docker/pkg/authorization"
"gotest.tools/assert"
"gotest.tools/poll"
"gotest.tools/skip"
)
@ -224,18 +225,7 @@ func TestAuthZPluginAllowEventStream(t *testing.T) {
// Create a container and wait for the creation events
cID := container.Run(t, ctx, c)
for i := 0; i < 100; i++ {
c, err := c.ContainerInspect(ctx, cID)
assert.NilError(t, err)
if c.State.Running {
break
}
if i == 99 {
t.Fatal("Container didn't run within 10s")
}
time.Sleep(100 * time.Millisecond)
}
poll.WaitOn(t, container.IsInState(ctx, c, cID, "running"))
created := false
started := false