Martchus
/
arch-repo-manager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix catching exception from `boost::filesystem` in `BuildServiceCleanup` and adapt tests

This commit is contained in:
Martchus 2023-04-08 18:43:58 +02:00
parent 87fd9bb4b1
commit 5af8de2468
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
librepomgr/buildactions/buildaction.cpp
View File

@ -495,7 +495,7 @@ void BuildServiceCleanup::run()
m_concreteCacheDirs.emplace_back(entry.path().filename().string(), std::move(canonical));
}
}
} catch (const boost::filesystem::filesystem_error &e) {
} catch (const std::exception &e) {
m_messages.errors.emplace_back(argsToString("unable to locate package cache directories: ", e.what()));
}
m_concreteCacheDirsIterator = m_concreteCacheDirs.begin();

7
librepomgr/tests/buildactions.cpp
View File

@ -947,5 +947,10 @@ void BuildActionsTests::testBuildServiceCleanup()
m_buildAction = std::make_shared<BuildAction>(0, &m_setup);
m_buildAction->type = BuildActionType::BuildServiceCleanup;
runBuildAction("buildservice cleanup");
CPPUNIT_ASSERT_EQUAL_MESSAGE("success", BuildActionResult::Success, m_buildAction->result);
CPPUNIT_ASSERT_EQUAL_MESSAGE("failure", BuildActionResult::Failure, m_buildAction->result);
const auto &messages = std::get<BuildActionMessages>(m_buildAction->resultData);
CPPUNIT_ASSERT_EQUAL_MESSAGE("one error", 1_st, messages.errors.size());
TESTUTILS_ASSERT_LIKE("expected error", "unable to locate package cache directories:.*No such file or directory.*", messages.errors.front());
CPPUNIT_ASSERT_EQUAL_MESSAGE("no warnings", std::vector<std::string>(), messages.warnings);
CPPUNIT_ASSERT_EQUAL_MESSAGE("no notes", std::vector<std::string>(), messages.notes);
}