mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-01 22:45:18 +00:00
Code Issues Releases Wiki Activity

[3971] Memfile_LeaseMgr test holds instance of TimerMgr.

Browse Source
This commit is contained in:
Marcin Siodelski
2015-09-28 11:10:15 +02:00
parent 973e98b726
commit 1aa71c350b
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
View File

@@ -109,7 +109,8 @@ public:
/// Creates memfile and stores it in lmptr_ pointer /// Creates memfile and stores it in lmptr_ pointer
MemfileLeaseMgrTest() : MemfileLeaseMgrTest() :
io4_(getLeaseFilePath("leasefile4_0.csv")), io4_(getLeaseFilePath("leasefile4_0.csv")),
io6_(getLeaseFilePath("leasefile6_0.csv")) { io6_(getLeaseFilePath("leasefile6_0.csv")),
timer_mgr_(TimerMgr::instance()) {
std::ostringstream s; std::ostringstream s;
s << KEA_LFC_BUILD_DIR << "/kea-lfc"; s << KEA_LFC_BUILD_DIR << "/kea-lfc";
@@ -137,9 +138,9 @@ public:
/// destroys lease manager backend. /// destroys lease manager backend.
virtual ~MemfileLeaseMgrTest() { virtual ~MemfileLeaseMgrTest() {
// Stop TimerMgr worker thread if it is running. // Stop TimerMgr worker thread if it is running.
TimerMgr::instance()->stopThread(); timer_mgr_->stopThread();
// Make sure there are no timers registered. // Make sure there are no timers registered.
TimerMgr::instance()->unregisterTimers(); timer_mgr_->unregisterTimers();
LeaseMgrFactory::destroy(); LeaseMgrFactory::destroy();
// Remove lease files and products of Lease File Cleanup. // Remove lease files and products of Lease File Cleanup.
removeFiles(getLeaseFilePath("leasefile4_0.csv")); removeFiles(getLeaseFilePath("leasefile4_0.csv"));
@@ -246,6 +247,8 @@ public:
/// @brief Object providing access to v6 lease IO. /// @brief Object providing access to v6 lease IO.
LeaseFileIO io6_; LeaseFileIO io6_;
/// @brief Pointer to the instance of the @c TimerMgr.
TimerMgrPtr timer_mgr_;
}; };
// This test checks if the LeaseMgr can be instantiated and that it // This test checks if the LeaseMgr can be instantiated and that it
@@ -348,7 +351,7 @@ TEST_F(MemfileLeaseMgrTest, lfcTimer) {
lease_mgr(new LFCMemfileLeaseMgr(pmap)); lease_mgr(new LFCMemfileLeaseMgr(pmap));
// Start worker thread to execute LFC periodically. // Start worker thread to execute LFC periodically.
TimerMgr::instance()->startThread(); ASSERT_NO_THROW(timer_mgr_->startThread());
// Run the test for at most 2.9 seconds. // Run the test for at most 2.9 seconds.
setTestTime(2900); setTestTime(2900);
@@ -356,7 +359,7 @@ TEST_F(MemfileLeaseMgrTest, lfcTimer) {
// Stop worker thread to make sure it is not running when lease // Stop worker thread to make sure it is not running when lease
// manager is destroyed. The lease manager will be unable to // manager is destroyed. The lease manager will be unable to
// unregster timer when the thread is active. // unregster timer when the thread is active.
TimerMgr::instance()->stopThread(); ASSERT_NO_THROW(timer_mgr_->stopThread());
// Within 2.9 we should record two LFC executions. // Within 2.9 we should record two LFC executions.
EXPECT_EQ(2, lease_mgr->getLFCCount()); EXPECT_EQ(2, lease_mgr->getLFCCount());
@@ -377,7 +380,7 @@ TEST_F(MemfileLeaseMgrTest, lfcTimerDisabled) {
lease_mgr(new LFCMemfileLeaseMgr(pmap)); lease_mgr(new LFCMemfileLeaseMgr(pmap));
// Start worker thread to execute LFC periodically. // Start worker thread to execute LFC periodically.
TimerMgr::instance()->startThread(); ASSERT_NO_THROW(timer_mgr_->startThread());
// Run the test for at most 1.9 seconds. // Run the test for at most 1.9 seconds.
setTestTime(1900); setTestTime(1900);
@@ -385,7 +388,7 @@ TEST_F(MemfileLeaseMgrTest, lfcTimerDisabled) {
// Stop worker thread to make sure it is not running when lease // Stop worker thread to make sure it is not running when lease
// manager is destroyed. The lease manager will be unable to // manager is destroyed. The lease manager will be unable to
// unregster timer when the thread is active. // unregster timer when the thread is active.
TimerMgr::instance()->stopThread(); ASSERT_NO_THROW(timer_mgr_->stopThread());
// There should be no LFC execution recorded. // There should be no LFC execution recorded.
EXPECT_EQ(0, lease_mgr->getLFCCount()); EXPECT_EQ(0, lease_mgr->getLFCCount());