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

Merge pull request #25329 from lixiaobing10051267/MasterBindVolume

Browse source 
It is volume not binds for first arg in callDecodeContainerConfig()
This commit is contained in:
Vincent Demeester 2016-08-03 16:10:37 +02:00 • committed by GitHub
commit d68253d19f
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
runconfig/opts/parse_test.go
View file

@ -186,7 +186,7 @@ func TestDecodeContainerConfigVolumes(t *testing.T) {
t.Fatalf("binds %v should have failed", bindsOrVols) t.Fatalf("binds %v should have failed", bindsOrVols)
} }
if _, _, err := callDecodeContainerConfig(bindsOrVols, nil); err == nil { if _, _, err := callDecodeContainerConfig(bindsOrVols, nil); err == nil {
t.Fatalf("binds %v should have failed", bindsOrVols) t.Fatalf("volume %v should have failed", bindsOrVols)
} }
// // No destination path or mode // // No destination path or mode
@ -195,7 +195,7 @@ func TestDecodeContainerConfigVolumes(t *testing.T) {
t.Fatalf("binds %v should have failed", bindsOrVols) t.Fatalf("binds %v should have failed", bindsOrVols)
} }
if _, _, err := callDecodeContainerConfig(bindsOrVols, nil); err == nil { if _, _, err := callDecodeContainerConfig(bindsOrVols, nil); err == nil {
t.Fatalf("binds %v should have failed", bindsOrVols) t.Fatalf("volume %v should have failed", bindsOrVols)
} }
// A whole lot of nothing // A whole lot of nothing
@ -204,7 +204,7 @@ func TestDecodeContainerConfigVolumes(t *testing.T) {
t.Fatalf("binds %v should have failed", bindsOrVols) t.Fatalf("binds %v should have failed", bindsOrVols)
} }
if _, _, err := callDecodeContainerConfig(bindsOrVols, nil); err == nil { if _, _, err := callDecodeContainerConfig(bindsOrVols, nil); err == nil {
t.Fatalf("binds %v should have failed", bindsOrVols) t.Fatalf("volume %v should have failed", bindsOrVols)
} }
// A whole lot of nothing with no mode // A whole lot of nothing with no mode
@ -213,7 +213,7 @@ func TestDecodeContainerConfigVolumes(t *testing.T) {
t.Fatalf("binds %v should have failed", bindsOrVols) t.Fatalf("binds %v should have failed", bindsOrVols)
} }
if _, _, err := callDecodeContainerConfig(bindsOrVols, nil); err == nil { if _, _, err := callDecodeContainerConfig(bindsOrVols, nil); err == nil {
t.Fatalf("binds %v should have failed", bindsOrVols) t.Fatalf("volume %v should have failed", bindsOrVols)
} }
// Too much including an invalid mode // Too much including an invalid mode
@ -223,7 +223,7 @@ func TestDecodeContainerConfigVolumes(t *testing.T) {
t.Fatalf("binds %v should have failed", bindsOrVols) t.Fatalf("binds %v should have failed", bindsOrVols)
} }
if _, _, err := callDecodeContainerConfig(bindsOrVols, nil); err == nil { if _, _, err := callDecodeContainerConfig(bindsOrVols, nil); err == nil {
t.Fatalf("binds %v should have failed", bindsOrVols) t.Fatalf("volume %v should have failed", bindsOrVols)
} }
// Windows specific error tests // Windows specific error tests
@ -234,7 +234,7 @@ func TestDecodeContainerConfigVolumes(t *testing.T) {
t.Fatalf("binds %v should have failed", bindsOrVols) t.Fatalf("binds %v should have failed", bindsOrVols)
} }
if _, _, err := callDecodeContainerConfig(bindsOrVols, nil); err == nil { if _, _, err := callDecodeContainerConfig(bindsOrVols, nil); err == nil {
t.Fatalf("binds %v should have failed", bindsOrVols) t.Fatalf("volume %v should have failed", bindsOrVols)
} }
// Root to C-Drive // Root to C-Drive
@ -243,7 +243,7 @@ func TestDecodeContainerConfigVolumes(t *testing.T) {
t.Fatalf("binds %v should have failed", bindsOrVols) t.Fatalf("binds %v should have failed", bindsOrVols)
} }
if _, _, err := callDecodeContainerConfig(bindsOrVols, nil); err == nil { if _, _, err := callDecodeContainerConfig(bindsOrVols, nil); err == nil {
t.Fatalf("binds %v should have failed", bindsOrVols) t.Fatalf("volume %v should have failed", bindsOrVols)
} }
// Container path that does not include a drive letter // Container path that does not include a drive letter
@ -252,7 +252,7 @@ func TestDecodeContainerConfigVolumes(t *testing.T) {
t.Fatalf("binds %v should have failed", bindsOrVols) t.Fatalf("binds %v should have failed", bindsOrVols)
} }
if _, _, err := callDecodeContainerConfig(bindsOrVols, nil); err == nil { if _, _, err := callDecodeContainerConfig(bindsOrVols, nil); err == nil {
t.Fatalf("binds %v should have failed", bindsOrVols) t.Fatalf("volume %v should have failed", bindsOrVols)
} }
} }
@ -264,7 +264,7 @@ func TestDecodeContainerConfigVolumes(t *testing.T) {
t.Fatalf("binds %v should have failed", bindsOrVols) t.Fatalf("binds %v should have failed", bindsOrVols)
} }
if _, _, err := callDecodeContainerConfig(bindsOrVols, nil); err == nil { if _, _, err := callDecodeContainerConfig(bindsOrVols, nil); err == nil {
t.Fatalf("binds %v should have failed", bindsOrVols) t.Fatalf("volume %v should have failed", bindsOrVols)
} }
// A single volume that looks like a bind mount passed in Volumes. // A single volume that looks like a bind mount passed in Volumes.