From: Wlodek Wencel <wlodek@isc.org>
Date: Tue, 10 Sep 2019 07:10:09 +0000 (+0200)
Subject: [#795] unit tests tweaked for new configuration
X-Git-Tag: Kea-1.7.1~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8f63199b13b78726b746764415560968f4c1c7b;p=thirdparty%2Fkea.git

[#795] unit tests tweaked for new configuration
---

diff --git a/src/bin/agent/tests/parser_unittests.cc b/src/bin/agent/tests/parser_unittests.cc
index 421c4e3e57..4cf8222659 100644
--- a/src/bin/agent/tests/parser_unittests.cc
+++ b/src/bin/agent/tests/parser_unittests.cc
@@ -177,15 +177,15 @@ TEST(ParserTest, keywordAgent) {
         "    \"control-sockets\": {"
         "        \"dhcp4\": {"
         "            \"socket-type\": \"unix\","
-        "            \"socket-name\": \"/path/to/the/unix/socket-v4\""
+        "            \"socket-name\": \"/tmp/kea4-ctrl-socket\""
         "        },"
         "        \"dhcp6\": {"
         "            \"socket-type\": \"unix\","
-        "            \"socket-name\": \"/path/to/the/unix/socket-v6\""
+        "            \"socket-name\": \"/tmp/kea6-ctrl-socket\""
         "        },"
         "        \"d2\": {"
         "            \"socket-type\": \"unix\","
-        "            \"socket-name\": \"/path/to/the/unix/socket-d2\""
+        "            \"socket-name\": \"/tmp/kea-ddns-ctrl-socket\""
         "        }"
         "    },"
         "    \"hooks-libraries\": ["
@@ -214,15 +214,15 @@ TEST(ParserTest, keywordSubAgent) {
         "    \"control-sockets\": {"
         "        \"dhcp4\": {"
         "            \"socket-type\": \"unix\","
-        "            \"socket-name\": \"/path/to/the/unix/socket-v4\""
+        "            \"socket-name\": \"/tmp/kea4-ctrl-socket\""
         "        },"
         "        \"dhcp6\": {"
         "            \"socket-type\": \"unix\","
-        "            \"socket-name\": \"/path/to/the/unix/socket-v6\""
+        "            \"socket-name\": \"/tmp/kea6-ctrl-socket\""
         "        },"
         "        \"d2\": {"
         "            \"socket-type\": \"unix\","
-        "            \"socket-name\": \"/path/to/the/unix/socket-d2\""
+        "            \"socket-name\": \"/tmp/kea-ddns-ctrl-socket\""
         "        }"
         "    },"
         "    \"hooks-libraries\": ["
diff --git a/src/bin/agent/tests/testdata/get_config.json b/src/bin/agent/tests/testdata/get_config.json
index 5b14d26005..6f9b5b3209 100644
--- a/src/bin/agent/tests/testdata/get_config.json
+++ b/src/bin/agent/tests/testdata/get_config.json
@@ -2,7 +2,7 @@
     "Control-agent": {
         "control-sockets": {
             "d2": {
-                "socket-name": "/path/to/the/unix/socket-d2",
+                "socket-name": "/tmp/kea-ddns-ctrl-socket",
                 "socket-type": "unix",
                 "user-context": {
                     "in-use": false
@@ -10,11 +10,11 @@
             },
             "dhcp4": {
                 "comment": "socket to DHCP4 server",
-                "socket-name": "/path/to/the/unix/socket-v4",
+                "socket-name": "/tmp/kea4-ctrl-socket",
                 "socket-type": "unix"
             },
             "dhcp6": {
-                "socket-name": "/path/to/the/unix/socket-v6",
+                "socket-name": "/tmp/kea6-ctrl-socket",
                 "socket-type": "unix"
             }
         },
diff --git a/src/bin/d2/d2_config.h b/src/bin/d2/d2_config.h
index bb8f2f1540..d15a39ec3f 100644
--- a/src/bin/d2/d2_config.h
+++ b/src/bin/d2/d2_config.h
@@ -80,7 +80,7 @@ namespace d2 {
 ///  "control-socket":
 ///  {
 ///    "socket-type": "unix" ,
-///    "socket-name": "/tmp/d2-ctrl-socket"
+///    "socket-name": "/tmp/kea-ddns-ctrl-socket"
 //// },
 ///  "tsig-keys":
 //// [
diff --git a/src/bin/d2/tests/testdata/get_config.json b/src/bin/d2/tests/testdata/get_config.json
index 6d46b68d9b..d49f359fd3 100644
--- a/src/bin/d2/tests/testdata/get_config.json
+++ b/src/bin/d2/tests/testdata/get_config.json
@@ -1,7 +1,7 @@
 {
     "DhcpDdns": {
         "control-socket": {
-            "socket-name": "/tmp/d2-ctrl-socket",
+            "socket-name": "/tmp/kea-ddns-ctrl-socket",
             "socket-type": "unix"
         },
         "dns-server-timeout": 1000,
diff --git a/src/bin/netconf/tests/parser_unittests.cc b/src/bin/netconf/tests/parser_unittests.cc
index 01cdd0ce4f..3842ed2530 100644
--- a/src/bin/netconf/tests/parser_unittests.cc
+++ b/src/bin/netconf/tests/parser_unittests.cc
@@ -135,7 +135,7 @@ TEST(ParserTest, keywordNetconf) {
         "            \"validate-changes\": false,"
         "            \"control-socket\": {"
         "                \"socket-type\": \"unix\","
-        "                \"socket-name\": \"/path/to/the/unix/socket-v4\""
+        "                \"socket-name\": \"/tmp/kea4-ctrl-socket\""
         "            }"
         "        },"
         "        \"dhcp6\": {"
@@ -200,7 +200,7 @@ TEST(ParserTest, keywordSubNetconf) {
         "            \"validate-changes\": false,"
         "            \"control-socket\": {"
         "                \"socket-type\": \"unix\","
-        "                \"socket-name\": \"/path/to/the/unix/socket-v4\""
+        "                \"socket-name\": \"/tmp/kea4-ctrl-socket\""
         "            }"
         "        },"
         "        \"dhcp6\": {"