Browse code

Check env var for setting driver in tests

Michael Crosby authored on 2013/11/19 20:13:22
Showing 1 changed files
... ...
@@ -4,6 +4,7 @@ import (
4 4
 	"fmt"
5 5
 	"github.com/dotcloud/docker/archive"
6 6
 	"github.com/dotcloud/docker/utils"
7
+	"os"
7 8
 	"path"
8 9
 )
9 10
 
... ...
@@ -66,9 +67,15 @@ func New(root string) (Driver, error) {
66 66
 	var driver Driver
67 67
 	var lastError error
68 68
 
69
-	if DefaultDriver != "" {
70
-		return GetDriver(DefaultDriver, root)
69
+	for _, name := range []string{
70
+		os.Getenv("DOCKER_DRIVER"),
71
+		DefaultDriver,
72
+	} {
73
+		if name != "" {
74
+			return GetDriver(name, root)
75
+		}
71 76
 	}
77
+
72 78
 	// Check for priority drivers first
73 79
 	for _, name := range priority {
74 80
 		driver, lastError = GetDriver(name, root)