mirror of
https://github.com/NixOS/nix.git
synced 2025-11-14 14:32:42 +01:00
getUri should be const and on Store::Config not Store
It is a side-effect property of the configuration alone, not the rest of the store.
This commit is contained in:
parent
f93d25c0e7
commit
0ef6f72c9c
33 changed files with 123 additions and 122 deletions
|
|
@ -8,9 +8,7 @@ namespace nix {
|
|||
|
||||
TEST(SSHStore, constructConfig)
|
||||
{
|
||||
initLibStore(/*loadConfig=*/false);
|
||||
|
||||
auto config = make_ref<SSHStoreConfig>(
|
||||
SSHStoreConfig config{
|
||||
"ssh-ng",
|
||||
"me@localhost:2222",
|
||||
StoreConfig::Params{
|
||||
|
|
@ -19,20 +17,19 @@ TEST(SSHStore, constructConfig)
|
|||
// TODO #11106, no more split on space
|
||||
"foo bar",
|
||||
},
|
||||
});
|
||||
},
|
||||
};
|
||||
|
||||
EXPECT_EQ(
|
||||
config->remoteProgram.get(),
|
||||
config.remoteProgram.get(),
|
||||
(Strings{
|
||||
"foo",
|
||||
"bar",
|
||||
}));
|
||||
|
||||
auto store = config->openStore();
|
||||
EXPECT_EQ(store->getUri(), "ssh-ng://me@localhost:2222?remote-program=foo%20bar");
|
||||
config->resetOverridden();
|
||||
store = config->openStore();
|
||||
EXPECT_EQ(store->getUri(), "ssh-ng://me@localhost:2222");
|
||||
EXPECT_EQ(config.getUri(), "ssh-ng://me@localhost:2222?remote-program=foo%20bar");
|
||||
config.resetOverridden();
|
||||
EXPECT_EQ(config.getUri(), "ssh-ng://me@localhost:2222");
|
||||
}
|
||||
|
||||
TEST(MountedSSHStore, constructConfig)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue