From: Francis Dupont <fdupont@isc.org>
Date: Fri, 6 Oct 2017 22:29:39 +0000 (+0200)
Subject: [master] Fixed a likely type d1 -> r1
X-Git-Tag: trac5382_base~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0ee985e22e6f12412d4bc45fae458db90e0a398;p=thirdparty%2Fkea.git

[master] Fixed a likely type d1 -> r1
---

diff --git a/src/lib/eval/tests/evaluate_unittest.cc b/src/lib/eval/tests/evaluate_unittest.cc
index 04ffd337b8..5afb635c91 100644
--- a/src/lib/eval/tests/evaluate_unittest.cc
+++ b/src/lib/eval/tests/evaluate_unittest.cc
@@ -502,7 +502,7 @@ TEST_F(ExpressionsTest, evaluateString) {
     testExpressionString(Option::V4,
                          "ifelse(option[200].exists,option[200].hex,"
                                  "ifelse(option[100].exists,"
-                                         "option[100].hex,'none???'))",
+                                         "option[100].hex,'none?'))",
                          "hundred4");
 }
 
diff --git a/src/lib/hooks/tests/hooks_manager_unittest.cc b/src/lib/hooks/tests/hooks_manager_unittest.cc
index 55e8138b9d..947263e645 100644
--- a/src/lib/hooks/tests/hooks_manager_unittest.cc
+++ b/src/lib/hooks/tests/hooks_manager_unittest.cc
@@ -119,7 +119,7 @@ public:
         handle->setArgument("data_1", d1);
         HooksManager::callCommandHandlers("command-one", *handle);
         handle->getArgument(RESULT, result);
-        EXPECT_EQ(d1, result) << "command-one" << COMMON_TEXT;
+        EXPECT_EQ(r1, result) << "command-one" << COMMON_TEXT;
 
         // Perform the second calculation: it should multiply the data by 10
         // and return in the result.