From: Francis Dupont <fdupont@isc.org>
Date: Fri, 15 Mar 2019 23:50:41 +0000 (+0100)
Subject: [430-configure-location-of-datadir] Fixed another post rebase issue
X-Git-Tag: Kea-1.6.0-beta~364
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f094e18a21124abcaf846cab52c8cba65ca36bc;p=thirdparty%2Fkea.git

[430-configure-location-of-datadir] Fixed another post rebase issue
---

diff --git a/src/bin/dhcp4/tests/parser_unittest.cc b/src/bin/dhcp4/tests/parser_unittest.cc
index b7c3133027..e66ffbc808 100644
--- a/src/bin/dhcp4/tests/parser_unittest.cc
+++ b/src/bin/dhcp4/tests/parser_unittest.cc
@@ -292,7 +292,7 @@ TEST(ParserTest, file) {
 TEST(ParserTest, globalParameters) {
     ConstElementPtr json;
     Parser4Context ctx;
-    string fname = string(CFG_EXAMPLES) + "/" + "all-keys.json";
+    string fname = string(CFG_EXAMPLES) + "/" + "all-keys-current.json";
     EXPECT_NO_THROW(json = ctx.parseFile(fname, Parser4Context::PARSER_DHCP4));
     EXPECT_NO_THROW(json = json->get("Dhcp4"));
     SimpleParser4 parser;
diff --git a/src/bin/dhcp6/tests/parser_unittest.cc b/src/bin/dhcp6/tests/parser_unittest.cc
index 0ce3c96e32..443fd41a33 100644
--- a/src/bin/dhcp6/tests/parser_unittest.cc
+++ b/src/bin/dhcp6/tests/parser_unittest.cc
@@ -302,7 +302,7 @@ TEST(ParserTest, file) {
 TEST(ParserTest, globalParameters) {
     ConstElementPtr json;
     Parser6Context ctx;
-    string fname = string(CFG_EXAMPLES) + "/" + "all-keys.json";
+    string fname = string(CFG_EXAMPLES) + "/" + "all-keys-current.json";
     EXPECT_NO_THROW(json = ctx.parseFile(fname, Parser6Context::PARSER_DHCP6));
     EXPECT_NO_THROW(json = json->get("Dhcp6"));
     SimpleParser6 parser;