luxolus
/
open-vault
2
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

Always use a local test server (#4207) 

Some commands didn't setup a local test server since they didn't need
it. Other commands didn't setup a local test server because Seth forgot.

Long story short, I kept seeing weird requests to my Vault server when I
ran tests, and that should never happen. This ensures all test requests
will go to a test Vault instance.

Benchmarks show this adds 0.4s to the command test suite.
This commit is contained in:
Seth Vargo 2018-03-28 22:34:37 +08:00 committed by Jeff Mitchell
parent 1a060446a9
commit f0dd5ae61f
15 changed files with 85 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
command/auth_disable_test.go
View File

@ -50,7 +50,11 @@ func TestAuthDisableCommand_Run(t *testing.T) {
t.Run(tc.name, func(t *testing.T) {
t.Parallel()
client, closer := testVaultServer(t)
defer closer()
ui, cmd := testAuthDisableCommand(t)
cmd.client = client
code := cmd.Run(tc.args)
if code != tc.code {

4
command/auth_help_test.go
View File

@ -54,7 +54,11 @@ func TestAuthHelpCommand_Run(t *testing.T) {
t.Run(tc.name, func(t *testing.T) {
t.Parallel()
client, closer := testVaultServer(t)
defer closer()
ui, cmd := testAuthHelpCommand(t)
cmd.client = client
code := cmd.Run(tc.args)
if code != tc.code {

4
command/auth_tune_test.go
View File

@ -51,7 +51,11 @@ func TestAuthTuneCommand_Run(t *testing.T) {
t.Run(tc.name, func(t *testing.T) {
t.Parallel()
client, closer := testVaultServer(t)
defer closer()
ui, cmd := testAuthTuneCommand(t)
cmd.client = client
code := cmd.Run(tc.args)
if code != tc.code {

4
command/delete_test.go
View File

@ -50,7 +50,11 @@ func TestDeleteCommand_Run(t *testing.T) {
t.Run(tc.name, func(t *testing.T) {
t.Parallel()
client, closer := testVaultServer(t)
defer closer()
ui, cmd := testDeleteCommand(t)
cmd.client = client
code := cmd.Run(tc.args)
if code != tc.code {

12
command/operator_generate_root_test.go
View File

@ -91,7 +91,11 @@ func TestOperatorGenerateRootCommand_Run(t *testing.T) {
t.Run(tc.name, func(t *testing.T) {
t.Parallel()
client, closer := testVaultServer(t)
defer closer()
ui, cmd := testOperatorGenerateRootCommand(t)
cmd.client = client
code := cmd.Run(tc.args)
if code != tc.code {
@ -109,7 +113,11 @@ func TestOperatorGenerateRootCommand_Run(t *testing.T) {
t.Run("generate_otp", func(t *testing.T) {
t.Parallel()
client, closer := testVaultServer(t)
defer closer()
ui, cmd := testOperatorGenerateRootCommand(t)
cmd.client = client
code := cmd.Run([]string{
"-generate-otp",
@ -130,7 +138,11 @@ func TestOperatorGenerateRootCommand_Run(t *testing.T) {
encoded := "L9MaZ/4mQanpOV6QeWd84g=="
otp := "dIeeezkjpDUv3fy7MYPOLQ=="
client, closer := testVaultServer(t)
defer closer()
ui, cmd := testOperatorGenerateRootCommand(t)
cmd.client = client
// Simulate piped output to print raw output
old := os.Stdout

4
command/operator_key_status_test.go
View File

@ -44,7 +44,11 @@ func TestOperatorKeyStatusCommand_Run(t *testing.T) {
t.Run(tc.name, func(t *testing.T) {
t.Parallel()
client, closer := testVaultServer(t)
defer closer()
ui, cmd := testOperatorKeyStatusCommand(t)
cmd.client = client
code := cmd.Run(tc.args)
if code != tc.code {

4
command/operator_unseal_test.go
View File

@ -27,7 +27,11 @@ func TestOperatorUnsealCommand_Run(t *testing.T) {
t.Run("error_non_terminal", func(t *testing.T) {
t.Parallel()
client, closer := testVaultServer(t)
defer closer()
ui, cmd := testOperatorUnsealCommand(t)
cmd.client = client
cmd.testOutput = ioutil.Discard
code := cmd.Run(nil)

4
command/policy_delete_test.go
View File

@ -51,7 +51,11 @@ func TestPolicyDeleteCommand_Run(t *testing.T) {
t.Run(tc.name, func(t *testing.T) {
t.Parallel()
client, closer := testVaultServer(t)
defer closer()
ui, cmd := testPolicyDeleteCommand(t)
cmd.client = client
code := cmd.Run(tc.args)
if code != tc.code {

20
command/policy_fmt_test.go
View File

@ -52,7 +52,11 @@ func TestPolicyFmtCommand_Run(t *testing.T) {
t.Run(tc.name, func(t *testing.T) {
t.Parallel()
client, closer := testVaultServer(t)
defer closer()
ui, cmd := testPolicyFmtCommand(t)
cmd.client = client
code := cmd.Run(tc.args)
if code != tc.code {
@ -87,7 +91,11 @@ path "secret" {
}
f.Close()
client, closer := testVaultServer(t)
defer closer()
_, cmd := testPolicyFmtCommand(t)
cmd.client = client
code := cmd.Run([]string{
f.Name(),
@ -126,7 +134,11 @@ path "secret" {
}
f.Close()
client, closer := testVaultServer(t)
defer closer()
ui, cmd := testPolicyFmtCommand(t)
cmd.client = client
code := cmd.Run([]string{
f.Name(),
@ -157,7 +169,11 @@ path "secret" {
}
f.Close()
client, closer := testVaultServer(t)
defer closer()
ui, cmd := testPolicyFmtCommand(t)
cmd.client = client
code := cmd.Run([]string{
f.Name(),
@ -188,7 +204,11 @@ path "secret" {
}
f.Close()
client, closer := testVaultServer(t)
defer closer()
ui, cmd := testPolicyFmtCommand(t)
cmd.client = client
code := cmd.Run([]string{
f.Name(),

4
command/rotate_test.go
View File

@ -44,7 +44,11 @@ func TestOperatorRotateCommand_Run(t *testing.T) {
t.Run(tc.name, func(t *testing.T) {
t.Parallel()
client, closer := testVaultServer(t)
defer closer()
ui, cmd := testOperatorRotateCommand(t)
cmd.client = client
code := cmd.Run(tc.args)
if code != tc.code {

4
command/secrets_move_test.go
View File

@ -56,7 +56,11 @@ func TestSecretsMoveCommand_Run(t *testing.T) {
t.Run(tc.name, func(t *testing.T) {
t.Parallel()
client, closer := testVaultServer(t)
defer closer()
ui, cmd := testSecretsMoveCommand(t)
cmd.client = client
code := cmd.Run(tc.args)
if code != tc.code {

4
command/secrets_tune_test.go
View File

@ -51,7 +51,11 @@ func TestSecretsTuneCommand_Run(t *testing.T) {
t.Run(tc.name, func(t *testing.T) {
t.Parallel()
client, closer := testVaultServer(t)
defer closer()
ui, cmd := testSecretsTuneCommand(t)
cmd.client = client
code := cmd.Run(tc.args)
if code != tc.code {

4
command/token_capabilities_test.go
View File

@ -42,7 +42,11 @@ func TestTokenCapabilitiesCommand_Run(t *testing.T) {
t.Run(tc.name, func(t *testing.T) {
t.Parallel()
client, closer := testVaultServer(t)
defer closer()
ui, cmd := testTokenCapabilitiesCommand(t)
cmd.client = client
code := cmd.Run(tc.args)
if code != tc.code {

4
command/token_revoke_test.go
View File

@ -86,7 +86,11 @@ func TestTokenRevokeCommand_Run(t *testing.T) {
t.Run(tc.name, func(t *testing.T) {
t.Parallel()
client, closer := testVaultServer(t)
defer closer()
ui, cmd := testTokenRevokeCommand(t)
cmd.client = client
code := cmd.Run(tc.args)
if code != tc.code {

5
command/version_test.go
View File

@ -26,7 +26,12 @@ func TestVersionCommand_Run(t *testing.T) {
t.Run("output", func(t *testing.T) {
t.Parallel()
client, closer := testVaultServer(t)
defer closer()
ui, cmd := testVersionCommand(t)
cmd.client = client
code := cmd.Run(nil)
if exp := 0; code != exp {
t.Errorf("expected %d to be %d", code, exp)