From: Shawn Routhier <sar@isc.org>
Date: Fri, 6 Mar 2015 02:14:54 +0000 (-0800)
Subject: [3694] Fix a test and some typos
X-Git-Tag: trac3713_base~1^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e85e5736ff1c9764e0381632bc561a737169389;p=thirdparty%2Fkea.git

[3694] Fix a test and some typos
---

diff --git a/src/lib/asiolink/tests/io_address_unittest.cc b/src/lib/asiolink/tests/io_address_unittest.cc
index b6c831fba2..504d01d719 100644
--- a/src/lib/asiolink/tests/io_address_unittest.cc
+++ b/src/lib/asiolink/tests/io_address_unittest.cc
@@ -169,7 +169,7 @@ TEST(IOAddressTest, isV6Zero) {
     const IOAddress address_non_zero1("::ff");
     EXPECT_FALSE(address_non_zero1.isV6Zero());
     // ff::
-    const IOAddress address_non_zero2("::ff");
+    const IOAddress address_non_zero2("ff::");
     EXPECT_FALSE(address_non_zero2.isV6Zero());
 }
 
diff --git a/src/lib/dhcpsrv/lease_mgr.h b/src/lib/dhcpsrv/lease_mgr.h
index 0f6430f29a..7b0674d11e 100644
--- a/src/lib/dhcpsrv/lease_mgr.h
+++ b/src/lib/dhcpsrv/lease_mgr.h
@@ -198,7 +198,7 @@ public:
     ///        and a subnet
     ///
     /// There can be at most one lease for a given HW address in a single
-    /// pool, so this method with either return a single lease or NULL.
+    /// pool, so this method will either return a single lease or NULL.
     ///
     /// @param hwaddr hardware address of the client
     /// @param subnet_id identifier of the subnet that lease must belong to
@@ -235,8 +235,8 @@ public:
 
     /// @brief Returns existing IPv4 lease for specified client-id
     ///
-    /// There can be at most one lease for a given HW address in a single
-    /// pool, so this method with either return a single lease or NULL.
+    /// There can be at most one lease for a given client-id in a single
+    /// pool, so this method will either return a single lease or NULL.
     ///
     /// @param clientid client identifier
     /// @param subnet_id identifier of the subnet that lease must belong to
diff --git a/src/lib/dhcpsrv/tests/alloc_engine4_unittest.cc b/src/lib/dhcpsrv/tests/alloc_engine4_unittest.cc
index c81e60a439..b6f7202620 100644
--- a/src/lib/dhcpsrv/tests/alloc_engine4_unittest.cc
+++ b/src/lib/dhcpsrv/tests/alloc_engine4_unittest.cc
@@ -1173,7 +1173,7 @@ TEST_F(AllocEngine4Test, reservedAddressConflictResolution) {
                                                     old_lease_);
     ASSERT_FALSE(offered_lease);
 
-    // Client A tries to renew the lease. The renewal should fail because
+    // Client A trys to renew the lease. The renewal should fail because
     // server detects that Client A doesn't have reservation for this
     // address.
     ASSERT_FALSE(engine.allocateLease4(subnet_, clientid_, hwaddr_,
@@ -1295,7 +1295,7 @@ TEST_F(AllocEngine4Test, reservedAddressHintUsedByOtherClient) {
 }
 
 // This test checks that the allocation engine refuses to allocate an
-// address when the pool is exhausted, and the only one available
+// address when the pool is exhausted, and the only available
 // address is reserved for a different client.
 TEST_F(AllocEngine4Test, reservedAddressShortPool) {
     AllocEngine engine(AllocEngine::ALLOC_ITERATIVE, 100, false);