From: Marcin Siodelski <marcin@isc.org>
Date: Tue, 17 Mar 2015 09:35:52 +0000 (+0100)
Subject: [3705] Minor fixes for the review.
X-Git-Tag: kea-0.9.1~19^2~2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=d7fb61910f937dbab4f4259caaec9f4c8ef0319b;p=thirdparty%2Fkea.git

[3705] Minor fixes for the review.
---

diff --git a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
index d7b29569ff..ea9b7fc6b2 100644
--- a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
@@ -2216,8 +2216,8 @@ TEST_F(Dhcpv6SrvTest, rsoo2relays) {
     Pkt6::RelayInfo relay2;
     relay2.msg_type_ = DHCPV6_RELAY_FORW;
     relay2.hop_count_ = 1;
-    relay2.linkaddr_ = IOAddress("2001:db8::1");
-    relay2.peeraddr_ = IOAddress("fe80::1");
+    relay2.linkaddr_ = IOAddress("2001:db8::2");
+    relay2.peeraddr_ = IOAddress("fe80::2");
     vector<uint16_t> rsoo2;
     rsoo2.push_back(120); // The relay2 will send 2 options: 120, 130
     rsoo2.push_back(130);
diff --git a/src/lib/dhcpsrv/tests/cfg_rsoo_unittest.cc b/src/lib/dhcpsrv/tests/cfg_rsoo_unittest.cc
index 3069c7508c..da8eeff79b 100644
--- a/src/lib/dhcpsrv/tests/cfg_rsoo_unittest.cc
+++ b/src/lib/dhcpsrv/tests/cfg_rsoo_unittest.cc
@@ -38,7 +38,7 @@ TEST(CfgRSOOTest, defaults) {
     }
 
     // Now, let's see if we can remove the default options.
-    ASSER_NO_THROW(rsoo.clear());
+    ASSERT_NO_THROW(rsoo.clear());
     EXPECT_FALSE(rsoo.enabled(D6O_ERP_LOCAL_DOMAIN_NAME));
 
     // Make sure it can be added again.
@@ -84,7 +84,7 @@ TEST(CfgRSOOTest, enableTwice) {
     // Enable option 88.
     ASSERT_FALSE(rsoo.enabled(88));
     ASSERT_NO_THROW(rsoo.enable(88));
-    EXPECT_TRUE(rsoo.enabled);
+    EXPECT_TRUE(rsoo.enabled(88));
 
     // And enable it again.
     ASSERT_NO_THROW(rsoo.enabled(88));