diff options
author | Tor Brede Vekterli <vekterli@vespa.ai> | 2024-05-14 13:28:20 +0000 |
---|---|---|
committer | Tor Brede Vekterli <vekterli@vespa.ai> | 2024-05-14 13:28:20 +0000 |
commit | f8eb4ce5e2eaad0899125c7117446acd578f72b5 (patch) | |
tree | 8e08f94477acf64818631808c43f399b5da519d5 /storageserver/src/tests | |
parent | 33166c63cd5c27a4f6c09b9e5b92f64ea36ee7ab (diff) |
Remove legacy storage node root directory IO in unit tests
Once upon a time, VDS roamed the lands. It used real disk IO as
part of tests. Then came the meteor and in-memory dummy persistence
took over. Now it is time for the fossils to be moved into a museum
where they belong.
Also make PID file writing conditional on a config that is set to
`false` during unit testing (but `true` as default).
Diffstat (limited to 'storageserver/src/tests')
-rw-r--r-- | storageserver/src/tests/testhelper.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/storageserver/src/tests/testhelper.cpp b/storageserver/src/tests/testhelper.cpp index 40e263d4e68..e3b047ddfd1 100644 --- a/storageserver/src/tests/testhelper.cpp +++ b/storageserver/src/tests/testhelper.cpp @@ -62,13 +62,11 @@ vdstestlib::DirConfig getStandardConfig(bool storagenode) { config->set("enable_dead_lock_detector_warnings", "false"); config->set("max_merges_per_node", "25"); config->set("max_merge_queue_size", "20"); - config->set("root_folder", - (storagenode ? "vdsroot" : "vdsroot.distributor")); - config->set("is_distributor", - (storagenode ? "false" : "true")); + config->set("root_folder", (storagenode ? "vdsroot" : "vdsroot.distributor")); + config->set("is_distributor", (storagenode ? "false" : "true")); + config->set("write_pid_file_on_startup", "false"); config = &dc.addConfig("stor-devices"); - config->set("root_folder", - (storagenode ? "vdsroot" : "vdsroot.distributor")); + config->set("root_folder", (storagenode ? "vdsroot" : "vdsroot.distributor")); config = &dc.addConfig("stor-status"); config->set("httpport", "0"); config = &dc.addConfig("stor-visitor"); |