[#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 421c4e3e578dabca9e4cc0499b991b775ecebc3e..4cf8222659adbb09670580cf64ad90f6903cea0d 100644 (file)
--- 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 5b14d26005effb59d41f45cb4df6ff3535292ccb..6f9b5b320934cd36c57040d3b8ed1b0d0b4f758b 100644 (file)
--- 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 bb8f2f1540a9cc0f128c8a0d76ede28af571d5af..d15a39ec3f6f35a7e2f26ccc8b43f53888b3e4da 100644 (file)
--- 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 6d46b68d9be0f8047c9d608fe19eb87769f90d31..d49f359fd39c6a747e80b1c311d3cf0a4af9d949 100644 (file)
--- 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 01cdd0ce4febf1adcc9c206519bcd4f31fc0ada1..3842ed253064c21dba5957d8cb18dec3d87008c1 100644 (file)
--- 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\": {"