[#729,!434] fixed rebase

diff --git a/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc b/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
index 0c8e3c730a07be53ce40080e81210a1d4a808f87..1c3faacd07b818efb1635e0c6c09c3571c519d07 100644 (file)
--- a/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
+++ b/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
@@ -952,7 +952,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, configTest) {
 }
 
 // This test verifies that the DHCP server handles version-get commands
-TEST_F(CtrlChannelDhcpv4SrvTest, getversion) {
+TEST_F(CtrlChannelDhcpv4SrvTest, getVersion) {
     createUnixChannelServer();
 
     std::string response;

diff --git a/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
index 0b52993f792a8cf0d11e4e08e0af77a9e820ccef..08cbf13e5c11cb02e349f7ea990b1d16e2e02def 100644 (file)
--- a/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
@@ -803,7 +803,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, configSet) {
 
 // Tests if the server returns its configuration using config-get.
 // Note there are separate tests that verify if toElement() called by the
-// get-config handler are actually converting the configuration correctly.
+// config-get handler are actually converting the configuration correctly.
 TEST_F(CtrlChannelDhcpv6SrvTest, configGet) {
     createUnixChannelServer();
     std::string response;
@@ -973,7 +973,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, configTest) {
 }
 
 // This test verifies that the DHCP server handles version-get commands
-TEST_F(CtrlChannelDhcpv6SrvTest, getversion) {
+TEST_F(CtrlChannelDhcpv6SrvTest, getVersion) {
     createUnixChannelServer();
 
     std::string response;
@@ -1117,7 +1117,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, controlLeasesReclaimRemove) {
 
 // Tests that the server properly responds to shtudown command sent
 // via ControlChannel
-TEST_F(CtrlChannelDhcpv6SrvTest, commandsList) {
+TEST_F(CtrlChannelDhcpv6SrvTest, listCommands) {
     createUnixChannelServer();
     std::string response;