|
@@ -124,15 +124,15 @@ TEST(ParserTest, keywordAgent) {
|
|
|
" \"http-host\": \"localhost\",\n"
|
|
|
" \"http-port\": 8000,\n"
|
|
|
" \"control-sockets\": {"
|
|
|
- " \"dhcp4-server\": {"
|
|
|
+ " \"dhcp4\": {"
|
|
|
" \"socket-type\": \"unix\","
|
|
|
" \"socket-name\": \"/path/to/the/unix/socket-v4\""
|
|
|
" },"
|
|
|
- " \"dhcp6-server\": {"
|
|
|
+ " \"dhcp6\": {"
|
|
|
" \"socket-type\": \"unix\","
|
|
|
" \"socket-name\": \"/path/to/the/unix/socket-v6\""
|
|
|
" },"
|
|
|
- " \"d2-server\": {"
|
|
|
+ " \"d2\": {"
|
|
|
" \"socket-type\": \"unix\","
|
|
|
" \"socket-name\": \"/path/to/the/unix/socket-d2\""
|
|
|
" }"
|
|
@@ -161,15 +161,15 @@ TEST(ParserTest, keywordSubAgent) {
|
|
|
" \"http-host\": \"localhost\",\n"
|
|
|
" \"http-port\": 8000,\n"
|
|
|
" \"control-sockets\": {"
|
|
|
- " \"dhcp4-server\": {"
|
|
|
+ " \"dhcp4\": {"
|
|
|
" \"socket-type\": \"unix\","
|
|
|
" \"socket-name\": \"/path/to/the/unix/socket-v4\""
|
|
|
" },"
|
|
|
- " \"dhcp6-server\": {"
|
|
|
+ " \"dhcp6\": {"
|
|
|
" \"socket-type\": \"unix\","
|
|
|
" \"socket-name\": \"/path/to/the/unix/socket-v6\""
|
|
|
" },"
|
|
|
- " \"d2-server\": {"
|
|
|
+ " \"d2\": {"
|
|
|
" \"socket-type\": \"unix\","
|
|
|
" \"socket-name\": \"/path/to/the/unix/socket-d2\""
|
|
|
" }"
|
|
@@ -196,7 +196,7 @@ TEST(ParserTest, bashComments) {
|
|
|
" \"http-host\": \"localhost\","
|
|
|
" \"http-port\": 9000,\n"
|
|
|
" \"control-sockets\": {\n"
|
|
|
- " \"d2-server\": {\n"
|
|
|
+ " \"d2\": {\n"
|
|
|
"# this is a comment\n"
|
|
|
"\"socket-type\": \"unix\", \n"
|
|
|
"# This socket is mine. I can name it whatever\n"
|
|
@@ -214,7 +214,7 @@ TEST(ParserTest, cppComments) {
|
|
|
" \"control-sockets\": {\n"
|
|
|
" // Let's try talking to D2. Sadly, it never talks"
|
|
|
" // to us back :( Maybe he doesn't like his name?\n"
|
|
|
- " \"d2-server\": {"
|
|
|
+ " \"d2\": {"
|
|
|
"\"socket-type\": \"unix\", \n"
|
|
|
"\"socket-name\": \"Hector\" \n"
|
|
|
"} } } }";
|
|
@@ -228,7 +228,7 @@ TEST(ParserTest, bashCommentsInline) {
|
|
|
" \"http-host\": \"localhost\","
|
|
|
" \"http-port\": 9000,\n"
|
|
|
" \"control-sockets\": {\n"
|
|
|
- " \"d2-server\": {"
|
|
|
+ " \"d2\": {"
|
|
|
"\"socket-type\": \"unix\", # Maybe Hector is not really a \n"
|
|
|
"\"socket-name\": \"Hector\" # Unix process?\n"
|
|
|
"# Oh no! He's a windows one and just pretending!\n"
|
|
@@ -242,12 +242,12 @@ TEST(ParserTest, multilineComments) {
|
|
|
" \"http-host\": \"localhost\","
|
|
|
" \"http-port\": 9000,\n"
|
|
|
" \"control-sockets\": {\n"
|
|
|
- " \"dhcp4-server\": {\n"
|
|
|
+ " \"dhcp4\": {\n"
|
|
|
" \"socket-type\": \"unix\"\n"
|
|
|
" }\n"
|
|
|
" /* Ok, forget about it. If Hector doesn't want to talk,\n"
|
|
|
" we won't talk to him either. We now have quiet days. */\n"
|
|
|
- " /* \"d2-server\": {"
|
|
|
+ " /* \"d2\": {"
|
|
|
" \"socket-type\": \"unix\",\n"
|
|
|
"\"socket-name\": \"Hector\"\n"
|
|
|
"}*/ } } }";
|