Use dockertest.v2 (#2247)

New dockertest has a totally different API and will require some serious
refactoring. This will tide over until then by pinning the API version.

builtin/logical/consul/backend_test.go

@@ -14,7 +14,7 @@ import (
 	"github.com/hashicorp/vault/logical"
 	logicaltest "github.com/hashicorp/vault/logical/testing"
 	"github.com/mitchellh/mapstructure"
-	"github.com/ory-am/dockertest"
+	dockertest "gopkg.in/ory-am/dockertest.v2"
 )
 
 var (

builtin/logical/mongodb/backend_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/hashicorp/vault/logical"
 	logicaltest "github.com/hashicorp/vault/logical/testing"
 	"github.com/mitchellh/mapstructure"
-	"github.com/ory-am/dockertest"
+	dockertest "gopkg.in/ory-am/dockertest.v2"
 )
 
 var (

builtin/logical/mysql/backend_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/hashicorp/vault/logical"
 	logicaltest "github.com/hashicorp/vault/logical/testing"
 	"github.com/mitchellh/mapstructure"
-	"github.com/ory-am/dockertest"
+	dockertest "gopkg.in/ory-am/dockertest.v2"
 )
 
 var (

builtin/logical/postgresql/backend_test.go

@@ -16,7 +16,7 @@ import (
 	logicaltest "github.com/hashicorp/vault/logical/testing"
 	"github.com/lib/pq"
 	"github.com/mitchellh/mapstructure"
-	"github.com/ory-am/dockertest"
+	dockertest "gopkg.in/ory-am/dockertest.v2"
 )
 
 var (

physical/consul_test.go

@@ -14,7 +14,7 @@ import (
 	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/vault/helper/logformat"
 	"github.com/hashicorp/vault/helper/strutil"
-	"github.com/ory-am/dockertest"
+	dockertest "gopkg.in/ory-am/dockertest.v2"
 )
 
 type consulConf map[string]string

vendor/gopkg.in/ory-am/dockertest.v2/README.md

@@ -8,9 +8,6 @@ Dockertest uses [Docker](https://www.docker.com/toolbox) to spin up images on Wi
 Dockertest is based on [docker.go](https://github.com/camlistore/camlistore/blob/master/pkg/test/dockertest/docker.go)
 from [camlistore](https://github.com/camlistore/camlistore).
 
-**IMPORTANT**  
-We strongly encourage you to move to [dockertest v3](https://github.com/ory-am/dockertest/tree/v3) for new and existing projects. It has a much cleaner API, less dependencies and is less prone to errors. V3 will be eventually merged into master.
-
 Dockertest currently supports these backends:
 * PostgreSQL
 * MySQL
@@ -25,7 +22,6 @@ Dockertest currently supports these backends:
 * ZooKeeper
 * Cassandra
 * Etcd
-* Consul
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->

vendor/vendor.json

@@ -888,12 +888,6 @@
 			"revision": "40fb0fd742247e3b54ebd9ebed09c35185663ba3",
 			"revisionTime": "2016-12-29T21:13:11Z"
 		},
-		{
-			"checksumSHA1": "OzjmTdiiKEaU+KznnMweDDrJd4I=",
-			"path": "github.com/ory-am/dockertest",
-			"revision": "911d4fa1cc9bfef27c518e100ff9a92e721fc1d4",
-			"revisionTime": "2016-11-25T09:43:23Z"
-		},
 		{
 			"checksumSHA1": "N5RwWgt0CCgyVin0kYbipyoy6O8=",
 			"path": "github.com/pborman/uuid",
@@ -1344,6 +1338,12 @@
 			"revision": "3f83fa5005286a7fe593b055f0d7771a7dce4655",
 			"revisionTime": "2016-08-18T02:01:20Z"
 		},
+		{
+			"checksumSHA1": "YCPcVG3Kac1aaDpbPUtsZ/BXNgg=",
+			"path": "gopkg.in/ory-am/dockertest.v2",
+			"revision": "edb9d9444e6868c1b1e279098b628e7b8e6f0714",
+			"revisionTime": "2016-10-18T17:13:38Z"
+		},
 		{
 			"checksumSHA1": "12GqsW8PiRPnezDDy0v4brZrndM=",
 			"path": "gopkg.in/yaml.v2",