Skip to content

Commit a0ad705

Browse files
author
Andrzej Religa
committed
Bug#35630329 reading master key fails if keyring-path contains symlink
Post-push fix: Adjusting the existing test MasterKeyFileNotChangedAfterSecondBootstrap to the changes to make it pass on MacOs. Change-Id: If3af931d86978d8087100274bf631adbbe420cc1
1 parent 7c24e26 commit a0ad705

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

router/tests/component/test_bootstrap.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1626,14 +1626,14 @@ TEST_F(RouterBootstrapTest,
16261626
* verify that master key file is not overridden by subsequent bootstrap.
16271627
*/
16281628
TEST_F(RouterBootstrapTest, MasterKeyFileNotChangedAfterSecondBootstrap) {
1629-
std::string master_key_path =
1630-
Path(bootstrap_dir.name()).join("mysqlrouter.key").str();
1631-
std::string keyring_path =
1632-
Path(bootstrap_dir.name()).join("data").join("keyring").str();
1633-
16341629
mysql_harness::mkdir(Path(bootstrap_dir.name()).str(), 0777);
16351630
mysql_harness::mkdir(Path(bootstrap_dir.name()).join("data").str(), 0777);
16361631

1632+
const std::string master_key_path =
1633+
Path(bootstrap_dir.name()).real_path().join("mysqlrouter.key").str();
1634+
const std::string keyring_path =
1635+
Path(bootstrap_dir.name()).real_path().join("data").join("keyring").str();
1636+
16371637
SCOPED_TRACE("// create the keyrings manually.");
16381638
auto &proc = launch_command(get_origin().join("mysqlrouter_keyring").str(),
16391639
{

0 commit comments

Comments
 (0)