diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-01-02 23:49:22 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-01-02 23:49:22 +0000 |
commit | 68b74816c5b6cc614107d3baf004011f2f427b2d (patch) | |
tree | 48bcad3503b1817de77a9fbd75e780c50978de3f /storage/src/tests/common/testhelper.cpp | |
parent | 5c55b1b26d664a6143ec4b93e0d4a23f798cab42 (diff) |
Ensure that we use unique directories.
Diffstat (limited to 'storage/src/tests/common/testhelper.cpp')
-rw-r--r-- | storage/src/tests/common/testhelper.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/storage/src/tests/common/testhelper.cpp b/storage/src/tests/common/testhelper.cpp index 214885fef7f..3ec189c573b 100644 --- a/storage/src/tests/common/testhelper.cpp +++ b/storage/src/tests/common/testhelper.cpp @@ -45,7 +45,12 @@ void addStorageDistributionConfig(vdstestlib::DirConfig& dc) } } -vdstestlib::DirConfig getStandardConfig(bool storagenode) { +std::string getRootFolder(vdstestlib::DirConfig & dc) { + std::string defaultValue(""); + return dc.getConfig("stor-server").getValue("root_folder", defaultValue); +} + +vdstestlib::DirConfig getStandardConfig(bool storagenode, const std::string & rootOfRoot) { std::string clusterName("storage"); vdstestlib::DirConfig dc; vdstestlib::DirConfig::Config* config; @@ -146,7 +151,8 @@ 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"); - vespalib::string rootFolder = (storagenode ? "vdsroot" : "vdsroot.distributor"); + vespalib::string rootFolder = rootOfRoot + "_"; + rootFolder += (storagenode ? "vdsroot" : "vdsroot.distributor"); config->set("root_folder", rootFolder); config->set("is_distributor", (storagenode ? "false" : "true")); config = &dc.addConfig("stor-devices"); |