mirror of
https://github.com/Icinga/icinga2.git
synced 2025-09-22 09:17:43 +02:00
Merge pull request #10561 from Icinga/cert-fixture-no-symlinks
Rename/Move certificates in unit test fixture instead of symlinking
This commit is contained in:
commit
c2c9b6b159
@ -29,8 +29,8 @@ struct CertificateFixture : ConfigurationDataDirFixture
|
|||||||
fs::remove(m_DataDir / "certs");
|
fs::remove(m_DataDir / "certs");
|
||||||
}
|
}
|
||||||
|
|
||||||
fs::create_directory_symlink(m_PersistentCertsDir / "certs", m_DataDir / "certs");
|
fs::rename(m_PersistentCertsDir / "ca", m_DataDir / "ca");
|
||||||
fs::create_directory_symlink(m_PersistentCertsDir / "ca", m_DataDir / "ca");
|
fs::rename(m_PersistentCertsDir / "certs", m_DataDir / "certs");
|
||||||
|
|
||||||
if (!fs::exists(m_CaCrtFile)) {
|
if (!fs::exists(m_CaCrtFile)) {
|
||||||
PkiUtility::NewCa();
|
PkiUtility::NewCa();
|
||||||
@ -38,7 +38,14 @@ struct CertificateFixture : ConfigurationDataDirFixture
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
auto EnsureCertFor(const std::string& name)
|
~CertificateFixture()
|
||||||
|
{
|
||||||
|
namespace fs = boost::filesystem;
|
||||||
|
fs::rename(m_DataDir / "ca", m_PersistentCertsDir / "ca");
|
||||||
|
fs::rename(m_DataDir / "certs", m_PersistentCertsDir / "certs");
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard]] auto EnsureCertFor(const std::string& name) const
|
||||||
{
|
{
|
||||||
struct Cert
|
struct Cert
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user