Test cleanup

hashicorp · Nov 17, 2022 · a92ff97 · a92ff97
1 parent 39fab8c
commit a92ff97
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/command/auth_enable_test.go b/command/auth_enable_test.go
@@ -2,7 +2,6 @@ package command
 
 import (
 	"io/ioutil"
-	"os"
 	"strings"
 	"testing"
 
@@ -227,8 +226,6 @@ func TestAuthEnableCommand_Run(t *testing.T) {
 		for _, b := range backends {
 			var expectedResult int = 0
 
-			status, _ := builtinplugins.Registry.DeprecationStatus(b, consts.PluginTypeCredential)
-
 			// Not a builtin
 			if b == "token" {
 				continue
@@ -242,6 +239,7 @@ func TestAuthEnableCommand_Run(t *testing.T) {
 			})
 
 			// Need to handle deprecated builtins specially
+			status, _ := builtinplugins.Registry.DeprecationStatus(b, consts.PluginTypeCredential)
 			if (status == consts.PendingRemoval && !vault.PendingRemovalMountsAllowed) || status == consts.Removed {
 				expectedResult = 2
 			}

diff --git a/command/path_map_upgrade_api_test.go b/command/path_map_upgrade_api_test.go
@@ -39,14 +39,15 @@ func TestPathMap_Upgrade_API(t *testing.T) {
 	client := cores[0].Client
 
 	// Enable the app-id method
+	prevAllowed := vault.PendingRemovalMountsAllowed
 	vault.PendingRemovalMountsAllowed = true
 	err = client.Sys().EnableAuthWithOptions("app-id", &api.EnableAuthOptions{
 		Type: "app-id",
 	})
 	if err != nil {
 		t.Fatal(err)
 	}
-	vault.PendingRemovalMountsAllowed = false
+	vault.PendingRemovalMountsAllowed = prevAllowed
 
 	// Create an app-id
 	_, err = client.Logical().Write("auth/app-id/map/app-id/test-app-id", map[string]interface{}{

diff --git a/command/secrets_enable_test.go b/command/secrets_enable_test.go
@@ -251,7 +251,6 @@ func TestSecretsEnableCommand_Run(t *testing.T) {
 
 		for _, b := range backends {
 			expectedResult := 0
-			status, _ := builtinplugins.Registry.DeprecationStatus(b, consts.PluginTypeSecrets)
 
 			ui, cmd := testSecretsEnableCommand(t)
 			cmd.client = client
@@ -261,6 +260,7 @@ func TestSecretsEnableCommand_Run(t *testing.T) {
 			})
 
 			// Need to handle deprecated builtins specially
+			status, _ := builtinplugins.Registry.DeprecationStatus(b, consts.PluginTypeSecrets)
 			if (status == consts.PendingRemoval && !vault.PendingRemovalMountsAllowed) || status == consts.Removed {
 				expectedResult = 2
 			}