[#3840] addressed review

diff --git a/src/bin/agent/tests/ca_controller_unittests.cc b/src/bin/agent/tests/ca_controller_unittests.cc
index e34649c8f4a2551ada48fef2741ceea3559277a4..f479b6e5fd52a63b07508ce006a2b07c191e8151 100644 (file)
--- a/src/bin/agent/tests/ca_controller_unittests.cc
+++ b/src/bin/agent/tests/ca_controller_unittests.cc
@@ -302,7 +302,7 @@ TEST_F(CtrlAgentControllerTest, successfulConfigUpdate) {
         "  \"control-sockets\": {"
         "    \"dhcp4\": {"
         "      \"socket-type\": \"unix\","
-        "      \"socket-name\": \"second_socket6\""
+        "      \"socket-name\": \"second_socket4\""
         "    },"
         "    \"dhcp6\": {"
         "      \"socket-type\": \"unix\","
@@ -345,7 +345,7 @@ TEST_F(CtrlAgentControllerTest, successfulConfigUpdate) {
     EXPECT_EQ(8080, ctx->getHttpPort());
 
     // The forwarding configuration should have been updated too.
-    testUnixSocketInfo("dhcp4", "second_socket6");
+    testUnixSocketInfo("dhcp4", "second_socket4");
     testUnixSocketInfo("dhcp6", "second_socket6");
 
     // After the shutdown the HTTP listener no longer exists.
@@ -368,7 +368,7 @@ TEST_F(CtrlAgentControllerTest, unsuccessfulConfigUpdate) {
         "  \"control-sockets\": {"
         "    \"dhcp4\": {"
         "      \"socket-type\": \"unix\","
-        "      \"socket-name\": \"second_socket6\""
+        "      \"socket-name\": \"second_socket4\""
         "    },"
         "    \"dhcp6\": {"
         "      \"socket-type\": \"unix\","
@@ -434,7 +434,7 @@ TEST_F(CtrlAgentControllerTest, noListenerChange) {
         "  \"control-sockets\": {"
         "    \"dhcp4\": {"
         "      \"socket-type\": \"unix\","
-        "      \"socket-name\": \"second_socket6\""
+        "      \"socket-name\": \"second_socket4\""
         "    },"
         "    \"dhcp6\": {"
         "      \"socket-type\": \"unix\","
@@ -476,7 +476,7 @@ TEST_F(CtrlAgentControllerTest, noListenerChange) {
     EXPECT_EQ(8081, ctx->getHttpPort());
 
     // The forwarding configuration should have been updated.
-    testUnixSocketInfo("dhcp4", "second_socket6");
+    testUnixSocketInfo("dhcp4", "second_socket4");
     testUnixSocketInfo("dhcp6", "second_socket6");
 
     CtrlAgentProcessPtr process = getCtrlAgentProcess();

diff --git a/src/bin/d2/tests/d2_cfg_mgr_unittests.cc b/src/bin/d2/tests/d2_cfg_mgr_unittests.cc
index c8fd3b1724e486a8302cda454cfa88d537336a93..95500ac06fa9f8a6d993f971f383ef60c380afb3 100644 (file)
--- a/src/bin/d2/tests/d2_cfg_mgr_unittests.cc
+++ b/src/bin/d2/tests/d2_cfg_mgr_unittests.cc
@@ -512,7 +512,7 @@ TEST_F(D2CfgMgrTest, fullConfig) {
                         "\"ncr-format\": \"JSON\", "
                         "\"control-socket\" : {"
                         " \"socket-type\" : \"unix\" ,"
-                        " \"socket-name\" : \"/tmp/d2-ctrl-channel\" "
+                        " \"socket-name\" : \"d2-ctrl-channel\" "
                         "},"
                         "\"hooks-libraries\": ["
                         "{"
@@ -599,7 +599,7 @@ TEST_F(D2CfgMgrTest, fullConfig) {
     ASSERT_TRUE(ctrl_sock->get("socket-type"));
     EXPECT_EQ("\"unix\"", ctrl_sock->get("socket-type")->str());
     ASSERT_TRUE(ctrl_sock->get("socket-name"));
-    EXPECT_EQ("\"/tmp/d2-ctrl-channel\"", ctrl_sock->get("socket-name")->str());
+    EXPECT_EQ("\"d2-ctrl-channel\"", ctrl_sock->get("socket-name")->str());
 
     // Verify that the hooks libraries can be retrieved.
     const HookLibsCollection libs = context->getHooksConfig().get();
@@ -1017,7 +1017,7 @@ TEST_F(D2CfgMgrTest, comments) {
                         "\"control-socket\": {"
                         " \"comment\": \"Control channel\" , "
                         " \"socket-type\": \"unix\" ,"
-                        " \"socket-name\": \"/tmp/d2-ctrl-channel\" "
+                        " \"socket-name\": \"d2-ctrl-channel\" "
                         "},"
                         "\"tsig-keys\": ["
                         "{"

diff --git a/src/bin/d2/tests/d2_command_unittest.cc b/src/bin/d2/tests/d2_command_unittest.cc
index b901826f4d37cb0a3f201c21e7ac3ca567dc8f5d..7eb2ac47c52d6c773c7e30ac3e92d6ac12ecf0be 100644 (file)
--- a/src/bin/d2/tests/d2_command_unittest.cc
+++ b/src/bin/d2/tests/d2_command_unittest.cc
@@ -154,7 +154,7 @@ public:
 
     /// @brief Sets the path in which the socket can be created.
     /// @param explicit_path path to use as the socket path.
-   void setSocketTestPath(const std::string explicit_path = "") {
+    void setSocketTestPath(const std::string explicit_path = "") {
         UnixCommandConfig::getSocketPath(true, (!explicit_path.empty() ?
                                          explicit_path : TEST_DATA_BUILDDIR));
 

diff --git a/src/lib/config/unix_command_config.h b/src/lib/config/unix_command_config.h
index 6c8da273ce9f542b16263cb1a73d36e00e235c9c..ca2aaa4421fc9df479c4a564a587e8aa9977bc13 100644 (file)
--- a/src/lib/config/unix_command_config.h
+++ b/src/lib/config/unix_command_config.h
@@ -14,7 +14,7 @@ namespace isc {
 namespace config {
 
 /// @brief UNIX command config aka UNIX control socket info class.
-class UnixCommandConfig { 
+class UnixCommandConfig {
 public:
     /// @brief Defines the default permissions for unix socket parent directory.
     static const mode_t DEFAULT_SOCKET_PATH_PERMS;

diff --git a/src/lib/util/tests/filesystem_unittests.cc b/src/lib/util/tests/filesystem_unittests.cc
index ca6b1540f797e873e43b3cfbd2f03fdfc36006fd..7da8d3cfd501ddea7799170bb039c13f237ff63b 100644 (file)
--- a/src/lib/util/tests/filesystem_unittests.cc
+++ b/src/lib/util/tests/filesystem_unittests.cc
@@ -434,5 +434,4 @@ TEST_F(FileUtilTest, hasPermissions) {
     EXPECT_FALSE(hasPermissions(path, current_permissions));
 }
 
-
 }  // namespace