drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 7 Pull Requests Actions Releases 9 Activity

[ox/fs] Add extra checks to FileSystem test

Browse Source
This commit is contained in:
Gary Talent 2018-09-02 10:20:01 -05:00
parent 1770c8a1e2
commit 72b9437ef5
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deps/ox/src/ox/fs/filesystem2/directory.hpp vendored
View File

@ -293,6 +293,7 @@ ValErr<typename FileStore::InodeId_t> Directory<FileStore, InodeId_t>::find(cons
for (auto i = buff->iterator(); i.valid(); i.next()) { for (auto i = buff->iterator(); i.valid(); i.next()) {
auto data = i->data(); auto data = i->data();
if (data.valid()) { if (data.valid()) {
oxTrace("ox::fs::Directory::find").del("") << "Comparing \"" << name.c_str() << "\" to \"" << data->name << "\"";
if (ox_strncmp(data->name, name.c_str(), name.len()) == 0) { if (ox_strncmp(data->name, name.c_str(), name.len()) == 0) {
return static_cast<InodeId_t>(data->inode); return static_cast<InodeId_t>(data->inode);
} }
@ -301,10 +302,11 @@ ValErr<typename FileStore::InodeId_t> Directory<FileStore, InodeId_t>::find(cons
} }
} }
oxTrace("ox::fs::Directory::find::fail"); oxTrace("ox::fs::Directory::find::fail");
return {0, OxError(1)};
} else { } else {
oxTrace("ox::fs::Directory::find::fail") << "Could not find directory buffer"; oxTrace("ox::fs::Directory::find::fail") << "Could not find directory buffer";
return {0, OxError(2)};
} }
return {0, OxError(1)};
} }

2
deps/ox/src/ox/fs/test/tests.cpp vendored
View File

@ -416,7 +416,9 @@ map<string, int(*)(string)> tests = {
oxTrace("ox::fs::test::FileSystem") << "mkdir"; oxTrace("ox::fs::test::FileSystem") << "mkdir";
oxAssert(fs.mkdir("/l1d1/l2d1/l3d1", true), "mkdir failed"); oxAssert(fs.mkdir("/l1d1/l2d1/l3d1", true), "mkdir failed");
oxAssert(fs.stat("/l1d1/l2d1/l3d1").error, "mkdir failed");
oxAssert(fs.mkdir("/l1d1/l2d2", true), "mkdir failed"); oxAssert(fs.mkdir("/l1d1/l2d2", true), "mkdir failed");
oxAssert(fs.stat("/l1d1/l2d2").error, "mkdir failed");
return 0; return 0;
} }