scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-01 02:57:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix up PGP tests from earlier code fixes

Browse Source
This commit is contained in:
Jeff Mitchell
2016-01-08 22:21:41 -05:00
parent d4f85c7241
commit 996cb54b99
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
command/pgp_test.go
View File

@@ -7,6 +7,7 @@ import (
"io/ioutil"
"reflect"
"regexp"
"sort"
"testing"
"github.com/hashicorp/vault/vault"
@@ -58,7 +59,7 @@ func getPubKeyFiles(t *testing.T) (string, []string, error) {
func parseDecryptAndTestUnsealKeys(t *testing.T,
input, rootToken string,
fingerprints bool,
backupKeys map[string]string,
backupKeys map[string][]string,
core *vault.Core) {
decoder := base64.StdEncoding
priv1Bytes, err := decoder.DecodeString(privKey1)
@@ -112,9 +113,10 @@ func parseDecryptAndTestUnsealKeys(t *testing.T,
}
if backupKeys != nil && len(matchedFingerprints) != 0 {
testMap := map[string]string{}
testMap := map[string][]string{}
for i, v := range matchedFingerprints {
testMap[v] = encodedKeys[i]
testMap[v] = append(testMap[v], encodedKeys[i])
sort.Strings(testMap[v])
}
if !reflect.DeepEqual(testMap, backupKeys) {
t.Fatalf("test map and backup map do not match, test map is\n%#v\nbackup map is\n%#v", testMap, backupKeys)