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

Port TestCluster changes from proxy branch

Browse Source
This commit is contained in:
Jeff Mitchell
2017-07-03 14:54:01 -04:00
parent 03b95432eb
commit f75f5b0add
7 changed files with 154 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
builtin/logical/database/dbplugin/plugin_test.go
View File

@@ -2,7 +2,6 @@ package dbplugin_test
import (
"errors"
stdhttp "net/http"
"os"
"testing"
"time"
@@ -73,26 +72,20 @@ func (m *mockPlugin) Close() error {
return nil
}
func getCore(t *testing.T) ([]*vault.TestClusterCore, logical.SystemView) {
func getCluster(t *testing.T) (*vault.TestCluster, logical.SystemView) {
coreConfig := &vault.CoreConfig{}
handler1 := stdhttp.NewServeMux()
handler2 := stdhttp.NewServeMux()
handler3 := stdhttp.NewServeMux()
cluster := vault.NewTestCluster(t, coreConfig, false)
cluster.StartListeners()
cores := cluster.Cores
cores[0].Handler.Handle("/", http.Handler(cores[0].Core))
cores[1].Handler.Handle("/", http.Handler(cores[1].Core))
cores[2].Handler.Handle("/", http.Handler(cores[2].Core))
// Chicken-and-egg: Handler needs a core. So we create handlers first, then
// add routes chained to a Handler-created handler.
cores := vault.TestCluster(t, []stdhttp.Handler{handler1, handler2, handler3}, coreConfig, false)
handler1.Handle("/", http.Handler(cores[0].Core))
handler2.Handle("/", http.Handler(cores[1].Core))
handler3.Handle("/", http.Handler(cores[2].Core))
sys := vault.TestDynamicSystemView(cores[0].Core)
vault.TestAddTestPlugin(t, cores[0].Core, "test-plugin", "TestPlugin_Main")
core := cores[0]
sys := vault.TestDynamicSystemView(core.Core)
vault.TestAddTestPlugin(t, core.Core, "test-plugin", "TestPlugin_Main")
return cores, sys
return cluster, sys
}
// This is not an actual test case, it's a helper function that will be executed
@@ -116,10 +109,8 @@ func TestPlugin_Main(t *testing.T) {
}
func TestPlugin_Initialize(t *testing.T) {
cores, sys := getCore(t)
for _, core := range cores {
defer core.CloseListeners()
}
cluster, sys := getCluster(t)
defer cluster.CloseListeners()
dbRaw, err := dbplugin.PluginFactory("test-plugin", sys, &log.NullLogger{})
if err != nil {
@@ -142,10 +133,8 @@ func TestPlugin_Initialize(t *testing.T) {
}
func TestPlugin_CreateUser(t *testing.T) {
cores, sys := getCore(t)
for _, core := range cores {
defer core.CloseListeners()
}
cluster, sys := getCluster(t)
defer cluster.CloseListeners()
db, err := dbplugin.PluginFactory("test-plugin", sys, &log.NullLogger{})
if err != nil {
@@ -184,10 +173,8 @@ func TestPlugin_CreateUser(t *testing.T) {
}
func TestPlugin_RenewUser(t *testing.T) {
cores, sys := getCore(t)
for _, core := range cores {
defer core.CloseListeners()
}
cluster, sys := getCluster(t)
defer cluster.CloseListeners()
db, err := dbplugin.PluginFactory("test-plugin", sys, &log.NullLogger{})
if err != nil {
@@ -220,10 +207,8 @@ func TestPlugin_RenewUser(t *testing.T) {
}
func TestPlugin_RevokeUser(t *testing.T) {
cores, sys := getCore(t)
for _, core := range cores {
defer core.CloseListeners()
}
cluster, sys := getCluster(t)
defer cluster.CloseListeners()
db, err := dbplugin.PluginFactory("test-plugin", sys, &log.NullLogger{})
if err != nil {