Merge pull request #25329 from lixiaobing10051267/MasterBindVolume

It is volume not binds for first arg in callDecodeContainerConfig()

runconfig/opts/parse_test.go

@@ -186,7 +186,7 @@ func TestDecodeContainerConfigVolumes(t *testing.T) {
 		t.Fatalf("binds %v should have failed", bindsOrVols)
 	}
 	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
@@ -195,7 +195,7 @@ func TestDecodeContainerConfigVolumes(t *testing.T) {
 		t.Fatalf("binds %v should have failed", bindsOrVols)
 	}
 	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
@@ -204,7 +204,7 @@ func TestDecodeContainerConfigVolumes(t *testing.T) {
 		t.Fatalf("binds %v should have failed", bindsOrVols)
 	}
 	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
@@ -213,7 +213,7 @@ func TestDecodeContainerConfigVolumes(t *testing.T) {
 		t.Fatalf("binds %v should have failed", bindsOrVols)
 	}
 	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
@@ -223,7 +223,7 @@ func TestDecodeContainerConfigVolumes(t *testing.T) {
 		t.Fatalf("binds %v should have failed", bindsOrVols)
 	}
 	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
@@ -234,7 +234,7 @@ func TestDecodeContainerConfigVolumes(t *testing.T) {
 			t.Fatalf("binds %v should have failed", bindsOrVols)
 		}
 		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
@@ -243,7 +243,7 @@ func TestDecodeContainerConfigVolumes(t *testing.T) {
 			t.Fatalf("binds %v should have failed", bindsOrVols)
 		}
 		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
@@ -252,7 +252,7 @@ func TestDecodeContainerConfigVolumes(t *testing.T) {
 			t.Fatalf("binds %v should have failed", bindsOrVols)
 		}
 		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)
 		}
 		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.