From cf64cbfe9cce90728ee59d574df524bbb240e38b Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <jeffrey.mitchell@gmail.com>
Date: Wed, 27 Apr 2016 20:59:06 +0000
Subject: [PATCH] Move TestSeal funcs to sealtesting

---
 Makefile             |  4 +---
 vault/sealtesting.go | 43 +++++++++++++++++++++++++++++++++++++++++
 vault/testing.go     | 46 --------------------------------------------
 3 files changed, 44 insertions(+), 49 deletions(-)

diff --git a/Makefile b/Makefile
index 0c714980db..73699eb129 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,7 @@
 TEST?=$$(go list ./... | grep -v /vendor/)
 VETARGS?=-asmdecl -atomic -bool -buildtags -copylocks -methods -nilfunc -printf -rangeloops -shift -structtags -unsafeptr
 EXTERNAL_TOOLS=\
-	github.com/mitchellh/gox \
-	golang.org/x/tools/cmd/cover \
-	golang.org/x/tools/cmd/vet
+	github.com/mitchellh/gox
 
 default: test
 
diff --git a/vault/sealtesting.go b/vault/sealtesting.go
index 0e9ff957d6..c9651e384d 100644
--- a/vault/sealtesting.go
+++ b/vault/sealtesting.go
@@ -3,6 +3,7 @@ package vault
 import (
 	"bytes"
 	"fmt"
+	"testing"
 )
 
 type TestSeal struct {
@@ -88,3 +89,45 @@ func (d *TestSeal) SetRecoveryKey(key []byte) error {
 	d.recoveryKey = newbuf.Bytes()
 	return nil
 }
+
+func TestCoreUnsealedWithConfigs(t *testing.T, barrierConf, recoveryConf *SealConfig) (*Core, [][]byte, [][]byte, string) {
+	seal := &TestSeal{}
+	core := TestCoreWithSeal(t, seal)
+	result, err := core.Initialize(barrierConf, recoveryConf)
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+	err = core.UnsealWithStoredKeys()
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+	if sealed, _ := core.Sealed(); sealed {
+		for _, key := range result.SecretShares {
+			if _, err := core.Unseal(key); err != nil {
+
+				t.Fatalf("unseal err: %s", err)
+			}
+		}
+
+		sealed, err = core.Sealed()
+		if err != nil {
+			t.Fatalf("err checking seal status: %s", err)
+		}
+		if sealed {
+			t.Fatal("should not be sealed")
+		}
+	}
+
+	return core, result.SecretShares, result.RecoveryShares, result.RootToken
+}
+
+func TestSealDefConfigs() (*SealConfig, *SealConfig) {
+	return &SealConfig{
+			SecretShares:    5,
+			SecretThreshold: 3,
+			StoredShares:    2,
+		}, &SealConfig{
+			SecretShares:    5,
+			SecretThreshold: 3,
+		}
+}
diff --git a/vault/testing.go b/vault/testing.go
index 02c6d6bd7a..1f16477091 100644
--- a/vault/testing.go
+++ b/vault/testing.go
@@ -376,49 +376,3 @@ func GenerateRandBytes(length int) ([]byte, error) {
 
 	return buf, nil
 }
-
-/*
- * TestSeal items
- */
-
-func TestCoreUnsealedWithConfigs(t *testing.T, barrierConf, recoveryConf *SealConfig) (*Core, [][]byte, [][]byte, string) {
-	seal := &TestSeal{}
-	core := TestCoreWithSeal(t, seal)
-	result, err := core.Initialize(barrierConf, recoveryConf)
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
-	err = core.UnsealWithStoredKeys()
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
-	if sealed, _ := core.Sealed(); sealed {
-		for _, key := range result.SecretShares {
-			if _, err := core.Unseal(key); err != nil {
-
-				t.Fatalf("unseal err: %s", err)
-			}
-		}
-
-		sealed, err = core.Sealed()
-		if err != nil {
-			t.Fatalf("err checking seal status: %s", err)
-		}
-		if sealed {
-			t.Fatal("should not be sealed")
-		}
-	}
-
-	return core, result.SecretShares, result.RecoveryShares, result.RootToken
-}
-
-func TestSealDefConfigs() (*SealConfig, *SealConfig) {
-	return &SealConfig{
-			SecretShares:    5,
-			SecretThreshold: 3,
-			StoredShares:    2,
-		}, &SealConfig{
-			SecretShares:    5,
-			SecretThreshold: 3,
-		}
-}