From ec42f5f219e41956280a1012a48fe3a949b76fd8 Mon Sep 17 00:00:00 2001 From: Jim Kalafut Date: Mon, 22 Jul 2019 09:39:13 -0700 Subject: [PATCH] Fix broken server config test (#7153) --- command/server/config_test.go | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/command/server/config_test.go b/command/server/config_test.go index e6e9dda429..75633e1673 100644 --- a/command/server/config_test.go +++ b/command/server/config_test.go @@ -6,16 +6,12 @@ import ( "testing" "time" - log "github.com/hashicorp/go-hclog" "github.com/hashicorp/hcl" "github.com/hashicorp/hcl/hcl/ast" - "github.com/hashicorp/vault/sdk/helper/logging" ) func TestLoadConfigFile(t *testing.T) { - logger := logging.NewVaultLogger(log.Debug) - - config, err := LoadConfigFile("./test-fixtures/config.hcl", logger) + config, err := LoadConfigFile("./test-fixtures/config.hcl") if err != nil { t.Fatalf("err: %s", err) } @@ -85,9 +81,7 @@ func TestLoadConfigFile(t *testing.T) { } func TestLoadConfigFile_topLevel(t *testing.T) { - logger := logging.NewVaultLogger(log.Debug) - - config, err := LoadConfigFile("./test-fixtures/config2.hcl", logger) + config, err := LoadConfigFile("./test-fixtures/config2.hcl") if err != nil { t.Fatalf("err: %s", err) } @@ -161,9 +155,7 @@ func TestLoadConfigFile_topLevel(t *testing.T) { } func TestLoadConfigFile_json(t *testing.T) { - logger := logging.NewVaultLogger(log.Debug) - - config, err := LoadConfigFile("./test-fixtures/config.hcl.json", logger) + config, err := LoadConfigFile("./test-fixtures/config.hcl.json") if err != nil { t.Fatalf("err: %s", err) } @@ -229,9 +221,7 @@ func TestLoadConfigFile_json(t *testing.T) { } func TestLoadConfigFile_json2(t *testing.T) { - logger := logging.NewVaultLogger(log.Debug) - - config, err := LoadConfigFile("./test-fixtures/config2.hcl.json", logger) + config, err := LoadConfigFile("./test-fixtures/config2.hcl.json") if err != nil { t.Fatalf("err: %s", err) } @@ -301,9 +291,7 @@ func TestLoadConfigFile_json2(t *testing.T) { } func TestLoadConfigDir(t *testing.T) { - logger := logging.NewVaultLogger(log.Debug) - - config, err := LoadConfigDir("./test-fixtures/config-dir", logger) + config, err := LoadConfigDir("./test-fixtures/config-dir") if err != nil { t.Fatalf("err: %s", err) }