p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
TestVolumesFromHasPriority fix race
Upstream-commit: c88b2c422ff55099f8dae2a39566698c42b3d354
Component: engine
This commit is contained in:
Tibor Vass
2015-04-02 16:01:09 -04:00
parent 5a322b178c 3c9c482afa
commit 7a161db875
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/integration-cli/docker_api_containers_test.go
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
func TestVolumesFromHasPriority(t *testing.T) {
defer deleteAllContainers()
volName := "voltst"
volName := "voltst2"
volPath := "/tmp"
if out, _, err := runCommandWithOutput(exec.Command(dockerBinary, "run", "-d", "--name", volName, "-v", volPath, "busybox")); err != nil {