From af6e54516488fb0707d220f4e01f261df835ff27 Mon Sep 17 00:00:00 2001
From: John Howard <jhoward@microsoft.com>
Date: Wed, 9 Sep 2015 19:23:06 -0700
Subject: [PATCH] Windows: Add volume support

Signed-off-by: John Howard <jhoward@microsoft.com>
---
 opts/opts.go      |  9 --------
 opts/opts_test.go | 52 -----------------------------------------------
 2 files changed, 61 deletions(-)

diff --git a/opts/opts.go b/opts/opts.go
index 3d8e4b4816..46adef1d85 100644
--- a/opts/opts.go
+++ b/opts/opts.go
@@ -9,7 +9,6 @@ import (
 	"strings"
 
 	"github.com/docker/docker/pkg/parsers"
-	"github.com/docker/docker/volume"
 )
 
 var (
@@ -214,14 +213,6 @@ func ValidateDevice(val string) (string, error) {
 	return validatePath(val, ValidDeviceMode)
 }
 
-// ValidatePath validates a path for volumes
-// It will make sure 'val' is in the form:
-//    [host-dir:]container-path[:rw|ro]
-// It also validates the mount mode.
-func ValidatePath(val string) (string, error) {
-	return validatePath(val, volume.ValidMountMode)
-}
-
 func validatePath(val string, validator func(string) bool) (string, error) {
 	var containerPath string
 	var mode string
diff --git a/opts/opts_test.go b/opts/opts_test.go
index baf5f53362..e02d3f8ea6 100644
--- a/opts/opts_test.go
+++ b/opts/opts_test.go
@@ -274,58 +274,6 @@ func TestValidateLink(t *testing.T) {
 	}
 }
 
-func TestValidatePath(t *testing.T) {
-	valid := []string{
-		"/home",
-		"/home:/home",
-		"/home:/something/else",
-		"/with space",
-		"/home:/with space",
-		"relative:/absolute-path",
-		"hostPath:/containerPath:ro",
-		"/hostPath:/containerPath:rw",
-		"/rw:/ro",
-		"/path:rw",
-		"/path:ro",
-		"/rw:rw",
-	}
-	invalid := map[string]string{
-		"":                "bad format for path: ",
-		"./":              "./ is not an absolute path",
-		"../":             "../ is not an absolute path",
-		"/:../":           "../ is not an absolute path",
-		"/:path":          "path is not an absolute path",
-		":":               "bad format for path: :",
-		"/tmp:":           " is not an absolute path",
-		":test":           "bad format for path: :test",
-		":/test":          "bad format for path: :/test",
-		"tmp:":            " is not an absolute path",
-		":test:":          "bad format for path: :test:",
-		"::":              "bad format for path: ::",
-		":::":             "bad format for path: :::",
-		"/tmp:::":         "bad format for path: /tmp:::",
-		":/tmp::":         "bad format for path: :/tmp::",
-		"path:ro":         "path is not an absolute path",
-		"/path:/path:sw":  "bad mode specified: sw",
-		"/path:/path:rwz": "bad mode specified: rwz",
-	}
-
-	for _, path := range valid {
-		if _, err := ValidatePath(path); err != nil {
-			t.Fatalf("ValidatePath(`%q`) should succeed: error %q", path, err)
-		}
-	}
-
-	for path, expectedError := range invalid {
-		if _, err := ValidatePath(path); err == nil {
-			t.Fatalf("ValidatePath(`%q`) should have failed validation", path)
-		} else {
-			if err.Error() != expectedError {
-				t.Fatalf("ValidatePath(`%q`) error should contain %q, got %q", path, expectedError, err.Error())
-			}
-		}
-	}
-}
 func TestValidateDevice(t *testing.T) {
 	valid := []string{
 		"/home",