Review feedback.

hashicorp · Feb 5, 2020 · 06b53eb · 06b53eb
1 parent c9d4025
commit 06b53eb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/command/seal_migration_oss_test.go b/command/seal_migration_oss_test.go
@@ -17,7 +17,7 @@ import (
 	"github.com/hashicorp/vault/vault/seal"
 )
 
-func TestSealMigrationAutoToShamir(t *testing.T) {
+func TestSealMigration_AutoToShamir(t *testing.T) {
 	t.Parallel()
 	t.Run("inmem", func(t *testing.T) {
 		t.Parallel()
@@ -60,7 +60,6 @@ func testSealMigrationAutoToShamir(t *testing.T, setup teststorage.ClusterSetupM
 	},
 		setup,
 	)
-	opts.SetupFunc = nil
 	cluster := vault.NewTestCluster(t, conf, opts)
 	cluster.Start()
 	defer cluster.Cleanup()

diff --git a/command/seal_migration_test.go b/command/seal_migration_test.go
@@ -96,7 +96,7 @@ func verifyBarrierConfig(t *testing.T, cfg *vault.SealConfig, sealType string, s
 	}
 }
 
-func TestSealMigrationShamirToAuto(t *testing.T) {
+func TestSealMigration_ShamirToAuto(t *testing.T) {
 	t.Parallel()
 	t.Run("inmem", func(t *testing.T) {
 		t.Parallel()
@@ -236,7 +236,7 @@ func testSealMigrationShamirToAuto(t *testing.T, setup teststorage.ClusterSetupM
 	verifyBarrierConfig(t, r, wrapping.Shamir, 5, 3, 0)
 }
 
-func TestSealMigrationAutoToAuto(t *testing.T) {
+func TestSealMigration_AutoToAuto(t *testing.T) {
 	t.Parallel()
 	t.Run("inmem", func(t *testing.T) {
 		t.Parallel()

diff --git a/helper/testhelpers/teststorage/teststorage.go b/helper/testhelpers/teststorage/teststorage.go
@@ -159,8 +159,10 @@ func RaftBackendSetup(conf *vault.CoreConfig, opts *vault.TestClusterOptions) {
 	opts.KeepStandbysSealed = true
 	opts.PhysicalFactory = MakeRaftBackend
 	opts.SetupFunc = func(t testing.T, c *vault.TestCluster) {
-		testhelpers.RaftClusterJoinNodes(t, c)
-		time.Sleep(15 * time.Second)
+		if opts.NumCores > 1 {
+			testhelpers.RaftClusterJoinNodes(t, c)
+			time.Sleep(15 * time.Second)
+		}
 	}
 }