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

DoNotInit -> SkipInit

This commit is contained in:
Jeff Mitchell 2017-09-04 16:29:43 -04:00
parent cbb0313f78
commit 0da8fa412d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vault/testing.go
View File

@ -709,7 +709,7 @@ type TestClusterCore struct {
type TestClusterOptions struct { type TestClusterOptions struct {
KeepStandbysSealed bool KeepStandbysSealed bool
DoNotInit bool SkipInit bool
HandlerFunc func(*Core) http.Handler HandlerFunc func(*Core) http.Handler
BaseListenAddress string BaseListenAddress string
NumCores int NumCores int
@ -1065,7 +1065,7 @@ func NewTestCluster(t testing.T, base *CoreConfig, opts *TestClusterOptions) *Te
} }
} }
if !opts.DoNotInit { if !opts.SkipInit {
keys, root := TestCoreInitClusterWrapperSetup(t, cores[0], clusterAddrGen(listeners[0]), handlers[0]) keys, root := TestCoreInitClusterWrapperSetup(t, cores[0], clusterAddrGen(listeners[0]), handlers[0])
barrierKeys, _ := copystructure.Copy(keys) barrierKeys, _ := copystructure.Copy(keys)
testCluster.BarrierKeys = barrierKeys.([][]byte) testCluster.BarrierKeys = barrierKeys.([][]byte)
@ -1159,7 +1159,7 @@ func NewTestCluster(t testing.T, base *CoreConfig, opts *TestClusterOptions) *Te
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
if !opts.DoNotInit { if !opts.SkipInit {
apiClient.SetToken(testCluster.RootToken) apiClient.SetToken(testCluster.RootToken)
} }
return apiClient return apiClient