Merge pull request #37477 from thaJeztah/fix_TestExternalGraphDriver_pull

Fix flaky TestExternalGraphDriver/pull test
This commit is contained in:
Sebastiaan van Stijn 2018-07-17 20:36:22 +02:00 committed by GitHub
commit 8f683c6ed5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -394,12 +394,12 @@ func testGraphDriverPull(c client.APIClient, d *daemon.Daemon) func(*testing.T)
defer d.Stop(t)
ctx := context.Background()
r, err := c.ImagePull(ctx, "busybox:latest", types.ImagePullOptions{})
r, err := c.ImagePull(ctx, "busybox:latest@sha256:bbc3a03235220b170ba48a157dd097dd1379299370e1ed99ce976df0355d24f0", types.ImagePullOptions{})
assert.NilError(t, err)
_, err = io.Copy(ioutil.Discard, r)
assert.NilError(t, err)
container.Run(t, ctx, c, container.WithImage("busybox:latest"))
container.Run(t, ctx, c, container.WithImage("busybox:latest@sha256:bbc3a03235220b170ba48a157dd097dd1379299370e1ed99ce976df0355d24f0"))
}
}