Skip to content

Commit 2933828

Browse files
committed
[#3477] Aligned v4 and v6 unit test files
1 parent 8c5829d commit 2933828

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc

+5-4
Original file line numberDiff line numberDiff line change
@@ -811,9 +811,10 @@ TEST_F(CtrlChannelDhcpv4SrvTest, configSet) {
811811
// Verify the control channel socket no longer exists.
812812
EXPECT_FALSE(fileExists(socket_path_));
813813

814-
// With no command channel, should still receive the response. The config contains random
815-
// socket name (/tmp/kea-<value-changing-each-time>/kea4.sock), so the
816-
// hash will be different each time. As such, we can do simplified checks:
814+
// With no command channel, should still receive the response.
815+
// The config contains random socket name
816+
// (/tmp/kea-<value-changing-each-time>/kea4.sock), so the hash will
817+
// be different each time. As such, we can do simplified checks:
817818
// - verify the "result": 0 is there
818819
// - verify the "text": "Configuration successful." is there
819820
EXPECT_NE(response.find("\"result\": 0"), std::string::npos);
@@ -868,7 +869,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, configHashGet) {
868869
int status;
869870
ConstElementPtr args = parseAnswer(status, rsp);
870871
EXPECT_EQ(CONTROL_RESULT_SUCCESS, status);
871-
// the parseAnswer is trying to be smart with ignoring hash.
872+
// The parseAnswer is trying to be smart with ignoring hash.
872873
// But this time we really want to see the hash, so we'll retrieve
873874
// the arguments manually.
874875
args = rsp->get(CONTROL_ARGUMENTS);

src/bin/dhcp4/tests/http_control_socket_unittest.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ class HttpCtrlChannelDhcpv4Test : public ::testing::Test {
263263
/// @param response_str a string containing the whole HTTP
264264
/// response received.
265265
///
266-
/// @return An HttpResponse constructed from parsing the response string.
266+
/// @return An HttpResponse constructed by parsing the response string.
267267
HttpResponsePtr parseResponse(const std::string response_str) {
268268
HttpResponsePtr hr(new HttpResponse());
269269
HttpResponseParser parser(*hr);
@@ -299,8 +299,8 @@ class HttpCtrlChannelDhcpv4Test : public ::testing::Test {
299299
ASSERT_TRUE(client);
300300

301301
// Send the command. This will trigger server's handler which receives
302-
// data over the HTTP socket. The server will start sending
303-
// response to the client.
302+
// data over the HTTP socket. The server will start sending response
303+
// to the client.
304304
ASSERT_NO_THROW(client->startRequest(buildPostStr(command)));
305305
runIOService();
306306
ASSERT_TRUE(client->receiveDone());

src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, configSet) {
726726
EXPECT_FALSE(fileExists(socket_path_));
727727

728728
// With no command channel, should still receive the response.
729-
// The config contains random socket name socket name
729+
// The config contains random socket name
730730
// (/tmp/kea-<value-changing-each-time>/kea6.sock), so the hash will
731731
// be different each time. As such, we can do simplified checks:
732732
// - verify the "result": 0 is there

0 commit comments

Comments
 (0)