[#2947] Compute the expected hash

diff --git a/src/bin/dhcp4/tests/hooks_unittest.cc b/src/bin/dhcp4/tests/hooks_unittest.cc
index cbb5d52058a59ad2fd97052a4c48b40d0de4c525..905ce87a6afdc1e3b6d7e1f2636fe3abb82d9560 100644 (file)
--- a/src/bin/dhcp4/tests/hooks_unittest.cc
+++ b/src/bin/dhcp4/tests/hooks_unittest.cc
@@ -3273,9 +3273,13 @@ TEST_F(LoadUnloadDhcpv4SrvTest, Dhcpv4SrvConfigured) {
         parseAnswer(status_code, answer);
         if (parameters.empty()) {
             EXPECT_EQ(0, status_code);
-            EXPECT_EQ(answer->str(), "{ \"arguments\": { \"hash\": \"C725E95F74A5BD2DC085B2F8A2877257"
-            "1BE04E99F127D3D78439264071A315B1\" }, \"result\": 0, \"text\": "
-            "\"Configuration successful.\" }");
+            string expected = "{ \"arguments\": { \"hash\": \"";
+            ConstElementPtr config =
+                CfgMgr::instance().getStagingCfg()->toElement();
+            expected += BaseCommandMgr::getHash(config);
+            expected += "\" }, \"result\": 0, \"text\": ";
+            expected += "\"Configuration successful.\" }";
+            EXPECT_EQ(answer->str(), expected);
         } else {
             EXPECT_EQ(1, status_code);
             if (parameters.find("fail-without-error") != string::npos) {

diff --git a/src/bin/dhcp6/tests/hooks_unittest.cc b/src/bin/dhcp6/tests/hooks_unittest.cc
index 79f79a81c9207d112a6e7effd765ccf4cfab18a4..7f38299d1c2e3e9984233207b878436a1e5b1f39 100644 (file)
--- a/src/bin/dhcp6/tests/hooks_unittest.cc
+++ b/src/bin/dhcp6/tests/hooks_unittest.cc
@@ -5674,10 +5674,13 @@ TEST_F(LoadUnloadDhcpv6SrvTest, Dhcpv6SrvConfigured) {
         parseAnswer(status_code, answer);
         if (parameters.empty()) {
             EXPECT_EQ(0, status_code);
-
-            EXPECT_EQ(answer->str(), "{ \"arguments\": { \"hash\": \"A6695A043B32703BA06D981929076F1C"
-            "94DEC0CF414E45AF146CEF5B50DB3EAA\" }, \"result\": 0, \"text\": "
-            "\"Configuration successful.\" }");
+            string expected = "{ \"arguments\": { \"hash\": \"";
+            ConstElementPtr config =
+                CfgMgr::instance().getStagingCfg()->toElement();
+            expected += BaseCommandMgr::getHash(config);
+            expected += "\" }, \"result\": 0, \"text\": ";
+            expected += "\"Configuration successful.\" }";
+            EXPECT_EQ(answer->str(), expected);
         } else {
             EXPECT_EQ(1, status_code);
             if (parameters.find("fail-without-error") != string::npos) {