From: Francis Dupont Date: Fri, 15 Mar 2019 23:48:45 +0000 (+0100) Subject: [430-configure-location-of-datadir] Better clear in CfgMgrTest X-Git-Tag: Kea-1.6.0-beta~365 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a48840c769a1aaaaba0236029c5d0c4563ab9cec;p=thirdparty%2Fkea.git [430-configure-location-of-datadir] Better clear in CfgMgrTest --- diff --git a/src/lib/dhcpsrv/tests/cfgmgr_unittest.cc b/src/lib/dhcpsrv/tests/cfgmgr_unittest.cc index c236c1c3a9..00ee479c04 100644 --- a/src/lib/dhcpsrv/tests/cfgmgr_unittest.cc +++ b/src/lib/dhcpsrv/tests/cfgmgr_unittest.cc @@ -262,6 +262,7 @@ class CfgMgrTest : public ::testing::Test { public: CfgMgrTest() { // make sure we start with a clean configuration + original_datadir_ = CfgMgr::instance().getDataDir(); clear(); } @@ -282,6 +283,7 @@ public: void clear() { CfgMgr::instance().setFamily(AF_INET); + CfgMgr::instance().setDataDir(original_datadir_); CfgMgr::instance().clear(); LeaseMgrFactory::destroy(); } @@ -304,6 +306,10 @@ public: /// used in client classification (or just empty container for other tests) isc::dhcp::ClientClasses classify_; + +private: + /// to restore it in destructor. + string original_datadir_; }; // Checks that there is a configuration structure available and that