From 749fd31899d480937567c2480e952de97cfc536b Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Sat, 7 Oct 2017 00:35:35 +0200 Subject: [PATCH] [master] Avoid EXPECT_EQ(true/false, ...) for EXPECT_TRUE/FALSE --- src/hooks/dhcp/lease_cmds/lease_cmds.cc | 4 +++- src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/hooks/dhcp/lease_cmds/lease_cmds.cc b/src/hooks/dhcp/lease_cmds/lease_cmds.cc index 863294428f..745b74b15a 100644 --- a/src/hooks/dhcp/lease_cmds/lease_cmds.cc +++ b/src/hooks/dhcp/lease_cmds/lease_cmds.cc @@ -205,7 +205,9 @@ public: int LeaseCmdsImpl::leaseAddHandler(CalloutHandle& handle) { - bool v4; + // Arbitrary defaulting to DHCPv4 or with other words extractCommand + // below is not expected to throw... + bool v4 = true; string txt = "malformed command"; try { extractCommand(handle); diff --git a/src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc b/src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc index 30cdd0da2e..97aee68c51 100644 --- a/src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc +++ b/src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc @@ -590,8 +590,8 @@ TEST_F(LeaseCmdsTest, Lease4Add) { ASSERT_TRUE(l->hwaddr_); EXPECT_EQ("1a:1b:1c:1d:1e:1f", l->hwaddr_->toText(false)); EXPECT_EQ(3, l->valid_lft_); // taken from subnet configuration - EXPECT_EQ(false, l->fqdn_fwd_); - EXPECT_EQ(false, l->fqdn_rev_); + EXPECT_FALSE(l->fqdn_fwd_); + EXPECT_FALSE(l->fqdn_rev_); EXPECT_EQ("", l->hostname_); // Test execution is fast. The cltt should be set to now. In some rare -- 2.47.2