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

backport of commit e29842e49e (#21712)

Browse Source 
Co-authored-by: Steven Clark <steven.clark@hashicorp.com>
This commit is contained in:
hc-github-team-secure-vault-core
2023-07-10 09:55:55 -04:00
committed by GitHub
parent 0e0b1d1a80
commit c9deb3aa0b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/logical/pki/path_tidy_test.go
View File

@@ -496,6 +496,7 @@ func TestCertStorageMetrics(t *testing.T) {
} }
cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{ cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
HandlerFunc: vaulthttp.Handler, HandlerFunc: vaulthttp.Handler,
NumCores: 1,
}) })
cluster.Start() cluster.Start()
defer cluster.Cleanup() defer cluster.Cleanup()
@@ -577,9 +578,9 @@ func TestCertStorageMetrics(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
// Reload the Mount - Otherwise Stored Certificate Counts Will Not Be Populated // Reload the Mount - Otherwise Stored Certificate Counts Will Not Be Populated
_, err = client.Logical().Write("/sys/plugins/reload/backend", map[string]interface{}{ // Sealing cores as plugin reload triggers the race detector - VAULT-13635
"plugin": "pki", testhelpers.EnsureCoresSealed(t, cluster)
}) testhelpers.EnsureCoresUnsealed(t, cluster)
// By reading the auto-tidy endpoint, we ensure that initialize has completed (which has a write lock on auto-tidy) // By reading the auto-tidy endpoint, we ensure that initialize has completed (which has a write lock on auto-tidy)
_, err = client.Logical().Read("/pki/config/auto-tidy") _, err = client.Logical().Read("/pki/config/auto-tidy")