[#3831] Fixed KEA_DHCP_DATA_DIR already set

diff --git a/src/lib/dhcpsrv/tests/cfgmgr_unittest.cc b/src/lib/dhcpsrv/tests/cfgmgr_unittest.cc
index 77e6dc7147fbaea2f49060bd973e6f666d5a20e2..4fdf366755673db559f00a42a14cbe57f7e2cd72 100644 (file)
--- a/src/lib/dhcpsrv/tests/cfgmgr_unittest.cc
+++ b/src/lib/dhcpsrv/tests/cfgmgr_unittest.cc
@@ -279,6 +279,7 @@ public:
     }
 
     void clear() {
+        data_dir_env_var_.setValue();
         CfgMgr::instance().setFamily(AF_INET);
         resetDataDir();
         CfgMgr::instance().clear();

diff --git a/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc b/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
index 20ce69c29f1c9f1750eeb48aa7c1539dcb9f3a49..0cad62ab61e61f7c693d6a2a7f527c4939b714d6 100644 (file)
--- a/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
+++ b/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
@@ -116,6 +116,9 @@ public:
         extra_files_(),
         data_dir_env_var_("KEA_DHCP_DATA_DIR") {
 
+        // Reset the env variable.
+        data_dir_env_var_.setValue();
+
         // Save the pre-test data dir and set it to the test directory.
         CfgMgr::instance().clear();
         original_datadir_ = CfgMgr::instance().getDataDir();