summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@online.no>2023-07-14 19:51:52 +0200
committerTor Egge <Tor.Egge@online.no>2023-07-14 19:51:52 +0200
commit2dcef04763b922b8fd5069ed4e4c8d2c1cd36cd4 (patch)
tree3991928e6f94f92e1e7d07e711a9148ded901db1 /searchcore
parent8eb009d276f9ab6b6774d8a4f44575f502def059 (diff)
Use std::filesystem::remove in unit tests.
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/tests/proton/index/diskindexcleaner_test.cpp6
-rw-r--r--searchcore/src/tests/proton/index/indexmanager_test.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/searchcore/src/tests/proton/index/diskindexcleaner_test.cpp b/searchcore/src/tests/proton/index/diskindexcleaner_test.cpp
index 35583ea46da..e8926a957b7 100644
--- a/searchcore/src/tests/proton/index/diskindexcleaner_test.cpp
+++ b/searchcore/src/tests/proton/index/diskindexcleaner_test.cpp
@@ -120,7 +120,7 @@ void Test::requireThatIndexesInUseAreNotRemoved() {
void Test::requireThatInvalidFlushIndexesAreRemoved() {
createIndexes();
- FastOS_File((index_dir + "/index.flush.4/serial.dat").c_str()).Delete();
+ std::filesystem::remove(std::filesystem::path(index_dir + "/index.flush.4/serial.dat"));
DiskIndexes disk_indexes;
DiskIndexCleaner::clean(index_dir, disk_indexes);
vector<string> indexes = readIndexes();
@@ -131,7 +131,7 @@ void Test::requireThatInvalidFlushIndexesAreRemoved() {
void Test::requireThatInvalidFusionIndexesAreRemoved() {
createIndexes();
- FastOS_File((index_dir + "/index.fusion.2/serial.dat").c_str()).Delete();
+ std::filesystem::remove(std::filesystem::path(index_dir + "/index.fusion.2/serial.dat"));
DiskIndexes disk_indexes;
DiskIndexCleaner::clean(index_dir, disk_indexes);
vector<string> indexes = readIndexes();
@@ -144,7 +144,7 @@ void Test::requireThatInvalidFusionIndexesAreRemoved() {
void Test::requireThatRemoveDontTouchNewIndexes() {
createIndexes();
- FastOS_File((index_dir + "/index.flush.4/serial.dat").c_str()).Delete();
+ std::filesystem::remove(std::filesystem::path(index_dir + "/index.flush.4/serial.dat"));
DiskIndexes disk_indexes;
DiskIndexCleaner::removeOldIndexes(index_dir, disk_indexes);
vector<string> indexes = readIndexes();
diff --git a/searchcore/src/tests/proton/index/indexmanager_test.cpp b/searchcore/src/tests/proton/index/indexmanager_test.cpp
index 2f6ebcd967f..a7209ea8897 100644
--- a/searchcore/src/tests/proton/index/indexmanager_test.cpp
+++ b/searchcore/src/tests/proton/index/indexmanager_test.cpp
@@ -728,7 +728,7 @@ TEST_F(IndexManagerTest, require_that_serial_number_is_read_on_load)
void crippleFusion(uint32_t fusionId) {
vespalib::asciistream ost;
ost << index_dir << "/index.flush." << fusionId << "/serial.dat";
- FastOS_File(ost.str().data()).Delete();
+ std::filesystem::remove(std::filesystem::path(ost.str()));
}
TEST_F(IndexManagerTest, require_that_failed_fusion_is_retried)