Ensure that we use unique directories.

2 files changed, 13 insertions, 5 deletions

diff --git a/storage/src/tests/bucketdb/bucketmanagertest.cpp b/storage/src/tests/bucketdb/bucketmanagertest.cpp
index aded935080d..b18d841bd5a 100644
--- a/storage/src/tests/bucketdb/bucketmanagertest.cpp
+++ b/storage/src/tests/bucketdb/bucketmanagertest.cpp
@@ -176,15 +176,22 @@ CPPUNIT_TEST_SUITE_REGISTRATION(BucketManagerTest);
         CPPUNIT_FAIL(ost.str()); \
     }
 
+std::string getRmDisk(const std::string & rootFolder, int disk) {
+    std::ostringstream os;
+    os << "rm -rf " << rootFolder << "/disks/d" << disk;
+    return os.str();
+}
+
 void BucketManagerTest::setupTestEnvironment(bool fakePersistenceLayer,
                                              bool noDelete)
 {
+    vdstestlib::DirConfig config(getStandardConfig(true, "bucketmanagertest"));
+    std::string rootFolder = getRootFolder(config);
     if (!noDelete) {
-        assert(system("rm -rf vdsroot") == 0);
+        assert(system(("rm -rf " + rootFolder).c_str()) == 0);
     }
-    assert(system("mkdir -p vdsroot/disks/d0") == 0);
-    assert(system("mkdir -p vdsroot/disks/d1") == 0);
-    vdstestlib::DirConfig config(getStandardConfig(true));
+    assert(system(getRmDisk(rootFolder, 0).c_str()) == 0);
+    assert(system(getRmDisk(rootFolder, 1).c_str()) == 0);
 
     DocumentTypeRepo::SP repo(new DocumentTypeRepo(
                 *ConfigGetter<DocumenttypesConfig>::getConfig(
diff --git a/storage/src/tests/bucketdb/initializertest.cpp b/storage/src/tests/bucketdb/initializertest.cpp
index 35094092e53..05e00184ce3 100644
--- a/storage/src/tests/bucketdb/initializertest.cpp
+++ b/storage/src/tests/bucketdb/initializertest.cpp
@@ -16,8 +16,9 @@
 #include <vespa/vdstestlib/cppunit/dirconfig.h>
 #include <vespa/vdstestlib/cppunit/macros.h>
 #include <vespa/storage/bucketdb/lockablemap.hpp>
-#include <vespa/log/log.h>
+#include <vespa/vdstestlib/cppunit/dirconfig.hpp>
 
+#include <vespa/log/log.h>
 LOG_SETUP(".test.bucketdb.initializing");
 
 namespace storage {