From: Marcin Siodelski Date: Thu, 12 Mar 2015 20:07:01 +0000 (+0100) Subject: [3688] Minor correction in the alloc_engine test. X-Git-Tag: trac3764_base~12^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19fe872f8edcae3751209ed67c72d36c991923ea;p=thirdparty%2Fkea.git [3688] Minor correction in the alloc_engine test. Also, removed some whitespaces. --- diff --git a/src/lib/dhcpsrv/host.cc b/src/lib/dhcpsrv/host.cc index 694af9e94b..f9e941c6ab 100644 --- a/src/lib/dhcpsrv/host.cc +++ b/src/lib/dhcpsrv/host.cc @@ -84,8 +84,8 @@ Host::Host(const uint8_t* identifier, const size_t identifier_len, : hw_address_(), duid_(), ipv4_subnet_id_(ipv4_subnet_id), ipv6_subnet_id_(ipv6_subnet_id), ipv4_reservation_(asiolink::IOAddress::IPV4_ZERO_ADDRESS()), - hostname_(hostname), dhcp4_client_classes_(dhcp4_client_classes), - dhcp6_client_classes_(dhcp6_client_classes) { + hostname_(hostname), dhcp4_client_classes_(dhcp4_client_classes), + dhcp6_client_classes_(dhcp6_client_classes) { // Initialize HWAddr or DUID setIdentifier(identifier, identifier_len, identifier_type); diff --git a/src/lib/dhcpsrv/tests/alloc_engine4_unittest.cc b/src/lib/dhcpsrv/tests/alloc_engine4_unittest.cc index c5c11fc300..eb59b44d2d 100644 --- a/src/lib/dhcpsrv/tests/alloc_engine4_unittest.cc +++ b/src/lib/dhcpsrv/tests/alloc_engine4_unittest.cc @@ -1334,17 +1334,19 @@ TEST_F(AllocEngine4Test, reservedHostname) { // Try to allocate a lease. AllocEngine::ClientContext4 ctx(subnet_, ClientIdPtr(), hwaddr_, - IOAddress::IPV4_ZERO_ADDRESS(), false, false, + IOAddress::IOAddress("192.0.2.109"), false, false, "foo.example.org", true); AllocEngine::findReservation(ctx); Lease4Ptr allocated_lease = engine.allocateLease4(ctx); ASSERT_TRUE(allocated_lease); ASSERT_FALSE(allocated_lease->addr_.isV4Zero()); + ASSERT_EQ("192.0.2.109", allocated_lease->addr_.toText()); ctx.requested_address_ = allocated_lease->addr_; ctx.fake_allocation_ = false; allocated_lease = engine.allocateLease4(ctx); ASSERT_TRUE(allocated_lease); + EXPECT_EQ("192.0.2.109", allocated_lease->addr_.toText()); } // This test checks that the AllocEngine::findReservation method finds