From 916205b8f6b8614b3db53d9408db8e93aadf738c Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Fri, 12 Apr 2019 22:05:01 -0400 Subject: [PATCH] Fix some test breakages --- builtin/logical/database/backend_test.go | 9 +++++---- builtin/logical/database/dbplugin/plugin_test.go | 7 ++++--- builtin/plugin/backend_test.go | 3 ++- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/builtin/logical/database/backend_test.go b/builtin/logical/database/backend_test.go index 588e7df22d..f6f6383e56 100644 --- a/builtin/logical/database/backend_test.go +++ b/builtin/logical/database/backend_test.go @@ -13,15 +13,16 @@ import ( "time" "github.com/go-test/deep" + "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/builtin/logical/database/dbplugin" - "github.com/hashicorp/vault/sdk/helper/consts" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/sdk/helper/pluginutil" vaulthttp "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/sdk/logical" - "github.com/hashicorp/vault/sdk/framework" "github.com/hashicorp/vault/plugins/database/postgresql" "github.com/hashicorp/vault/plugins/helper/database/dbutil" + "github.com/hashicorp/vault/sdk/framework" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" "github.com/lib/pq" "github.com/mitchellh/mapstructure" diff --git a/builtin/logical/database/dbplugin/plugin_test.go b/builtin/logical/database/dbplugin/plugin_test.go index 95944fc316..2556ceab10 100644 --- a/builtin/logical/database/dbplugin/plugin_test.go +++ b/builtin/logical/database/dbplugin/plugin_test.go @@ -8,13 +8,14 @@ import ( "time" log "github.com/hashicorp/go-hclog" + "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/builtin/logical/database/dbplugin" - "github.com/hashicorp/vault/sdk/helper/consts" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/sdk/helper/pluginutil" vaulthttp "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/plugins" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" ) diff --git a/builtin/plugin/backend_test.go b/builtin/plugin/backend_test.go index 3794319597..b93cf0df64 100644 --- a/builtin/plugin/backend_test.go +++ b/builtin/plugin/backend_test.go @@ -7,11 +7,12 @@ import ( "testing" log "github.com/hashicorp/go-hclog" + "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/builtin/plugin" + vaulthttp "github.com/hashicorp/vault/http" "github.com/hashicorp/vault/sdk/helper/consts" "github.com/hashicorp/vault/sdk/helper/logging" "github.com/hashicorp/vault/sdk/helper/pluginutil" - vaulthttp "github.com/hashicorp/vault/http" "github.com/hashicorp/vault/sdk/logical" logicalPlugin "github.com/hashicorp/vault/sdk/plugin" "github.com/hashicorp/vault/sdk/plugin/mock"