Use testEnv methods and remove most of the global variables

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
This commit is contained in:
Vincent Demeester
2017-01-13 17:23:28 +01:00
parent a7c3389a82
commit c8016e669f
40 changed files with 180 additions and 231 deletions

View File

@@ -1,12 +1,13 @@
package main
import (
"github.com/docker/docker/pkg/testutil/cmd"
"os/exec"
"github.com/docker/docker/pkg/testutil/cmd"
)
func getPrefixAndSlashFromDaemonPlatform() (prefix, slash string) {
if daemonPlatform == "windows" {
if testEnv.DaemonPlatform() == "windows" {
return "c:", `\`
}
return "", "/"