Rename/Move existing certs/ca instead of symlinking

jschmidt-icinga · jschmidt-icinga · commit 9469478d7c74 · 2025-09-16T13:35:18.000+02:00
diff --git a/test/remote-certificate-fixture.hpp b/test/remote-certificate-fixture.hpp
@@ -29,16 +29,23 @@ struct CertificateFixture : ConfigurationDataDirFixture
 			fs::remove(m_DataDir / "certs");
 		}
 
-		fs::create_directory_symlink(m_PersistentCertsDir / "certs", m_DataDir / "certs");
-		fs::create_directory_symlink(m_PersistentCertsDir / "ca", m_DataDir / "ca");
+		fs::rename(m_PersistentCertsDir / "ca", m_DataDir / "ca");
+		fs::rename(m_PersistentCertsDir / "certs", m_DataDir / "certs");
 
 		if (!fs::exists(m_CaCrtFile)) {
 			PkiUtility::NewCa();
 			fs::copy_file(m_CaDir / "ca.crt", m_CaCrtFile);
 		}
 	}
 
-	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
 		{

Original file line number	Diff line number	Diff line change
`@@ -29,16 +29,23 @@ struct CertificateFixture : ConfigurationDataDirFixture`
`29`	`29`	`fs::remove(m_DataDir / "certs");`
`30`	`30`	`}`
`31`	`31`
`32`		`- fs::create_directory_symlink(m_PersistentCertsDir / "certs", m_DataDir / "certs");`
`33`		`- fs::create_directory_symlink(m_PersistentCertsDir / "ca", m_DataDir / "ca");`
	`32`	`+ fs::rename(m_PersistentCertsDir / "ca", m_DataDir / "ca");`
	`33`	`+ fs::rename(m_PersistentCertsDir / "certs", m_DataDir / "certs");`
`34`	`34`
`35`	`35`	`if (!fs::exists(m_CaCrtFile)) {`
`36`	`36`	`PkiUtility::NewCa();`
`37`	`37`	`fs::copy_file(m_CaDir / "ca.crt", m_CaCrtFile);`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
`41`		`- auto EnsureCertFor(const std::string& name)`
	`41`	`+ ~CertificateFixture()`
	`42`	`+ {`
	`43`	`+ namespace fs = boost::filesystem;`
	`44`	`+ fs::rename(m_DataDir / "ca", m_PersistentCertsDir / "ca");`
	`45`	`+ fs::rename(m_DataDir / "certs", m_PersistentCertsDir / "certs");`
	`46`	`+ }`
	`47`	`+`
	`48`	`+ [[nodiscard]] auto EnsureCertFor(const std::string& name) const`
`42`	`49`	`{`
`43`	`50`	`struct Cert`
`44`	`51`	`{`