1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request #12012 from jfrazelle/fix-race-volumes-from-api

TestVolumesFromHasPriority fix race
This commit is contained in:
Tibor Vass 2015-04-02 16:01:09 -04:00
commit c88b2c422f

View file

@ -232,7 +232,7 @@ func TestContainerApiStartVolumesFrom(t *testing.T) {
// This is pretty much the same as TestRunApplyVolumesFromBeforeVolumes, except with passing the VolumesFrom and the bind on start // This is pretty much the same as TestRunApplyVolumesFromBeforeVolumes, except with passing the VolumesFrom and the bind on start
func TestVolumesFromHasPriority(t *testing.T) { func TestVolumesFromHasPriority(t *testing.T) {
defer deleteAllContainers() defer deleteAllContainers()
volName := "voltst" volName := "voltst2"
volPath := "/tmp" volPath := "/tmp"
if out, _, err := runCommandWithOutput(exec.Command(dockerBinary, "run", "-d", "--name", volName, "-v", volPath, "busybox")); err != nil { if out, _, err := runCommandWithOutput(exec.Command(dockerBinary, "run", "-d", "--name", volName, "-v", volPath, "busybox")); err != nil {