From 1c5ff16bc995dd289fe932385d6fe010bb48d003 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Fri, 23 Oct 2020 16:28:08 -0700 Subject: [PATCH] test/mon: fix compiler errors in MonMap unittest The code atrophied. Clean this up. The tests are disabled because they SIGSEGV during SetUp. Signed-off-by: Patrick Donnelly (cherry picked from commit 06f44cbf12c20ce8f1862111340f3b3f132577d0) Conflicts: src/test/mon/MonMap.cc - do not attempt to introduce boost::intrusive_ptr into nautilus - monmap.build_initial takes bare cct in nautilus (master: cct.get()) --- src/test/mon/MonMap.cc | 48 +++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src/test/mon/MonMap.cc b/src/test/mon/MonMap.cc index f3c00bfd79442..a9206e9cb8ad1 100644 --- a/src/test/mon/MonMap.cc +++ b/src/test/mon/MonMap.cc @@ -45,7 +45,7 @@ class MonMapTest : public ::testing::Test { } }; -TEST_F(MonMapTest, build_initial_config_from_dns) { +TEST_F(MonMapTest, DISABLED_build_initial_config_from_dns) { MockResolvHWrapper *resolvH = new MockResolvHWrapper(); DNSResolver::get_instance(resolvH); @@ -102,25 +102,25 @@ TEST_F(MonMapTest, build_initial_config_from_dns) { int r = monmap.build_initial(cct, false, std::cerr); ASSERT_EQ(r, 0); - ASSERT_EQ(monmap.mon_addr.size(), (unsigned int)3); - map::iterator it = monmap.mon_addr.find("mon.a"); - ASSERT_NE(it, monmap.mon_addr.end()); + ASSERT_EQ(monmap.mon_info.size(), (unsigned int)3); + auto it = monmap.mon_info.find("mon.a"); + ASSERT_NE(it, monmap.mon_info.end()); std::ostringstream os; - os << it->second; + os << it->second.public_addrs; ASSERT_EQ(os.str(), "192.168.1.11:6789/0"); os.str(""); - it = monmap.mon_addr.find("mon.b"); - ASSERT_NE(it, monmap.mon_addr.end()); - os << it->second; + it = monmap.mon_info.find("mon.b"); + ASSERT_NE(it, monmap.mon_info.end()); + os << it->second.public_addrs; ASSERT_EQ(os.str(), "192.168.1.12:6789/0"); os.str(""); - it = monmap.mon_addr.find("mon.c"); - ASSERT_NE(it, monmap.mon_addr.end()); - os << it->second; + it = monmap.mon_info.find("mon.c"); + ASSERT_NE(it, monmap.mon_info.end()); + os << it->second.public_addrs; ASSERT_EQ(os.str(), "192.168.1.13:6789/0"); } -TEST_F(MonMapTest, build_initial_config_from_dns_fail) { +TEST_F(MonMapTest, DISABLED_build_initial_config_from_dns_fail) { MockResolvHWrapper *resolvH = new MockResolvHWrapper(); DNSResolver::get_instance(resolvH); @@ -139,11 +139,11 @@ TEST_F(MonMapTest, build_initial_config_from_dns_fail) { int r = monmap.build_initial(cct, false, std::cerr); ASSERT_EQ(r, -ENOENT); - ASSERT_EQ(monmap.mon_addr.size(), (unsigned int)0); + ASSERT_EQ(monmap.mon_info.size(), (unsigned int)0); } -TEST_F(MonMapTest, build_initial_config_from_dns_with_domain) { +TEST_F(MonMapTest, DISABLED_build_initial_config_from_dns_with_domain) { MockResolvHWrapper *resolvH = new MockResolvHWrapper(); DNSResolver::get_instance(resolvH); @@ -200,21 +200,21 @@ TEST_F(MonMapTest, build_initial_config_from_dns_with_domain) { int r = monmap.build_initial(cct, false, std::cerr); ASSERT_EQ(r, 0); - ASSERT_EQ(monmap.mon_addr.size(), (unsigned int)3); - map::iterator it = monmap.mon_addr.find("mon.a"); - ASSERT_NE(it, monmap.mon_addr.end()); + ASSERT_EQ(monmap.mon_info.size(), (unsigned int)3); + auto it = monmap.mon_info.find("mon.a"); + ASSERT_NE(it, monmap.mon_info.end()); std::ostringstream os; - os << it->second; + os << it->second.public_addrs; ASSERT_EQ(os.str(), "192.168.1.11:6789/0"); os.str(""); - it = monmap.mon_addr.find("mon.b"); - ASSERT_NE(it, monmap.mon_addr.end()); - os << it->second; + it = monmap.mon_info.find("mon.b"); + ASSERT_NE(it, monmap.mon_info.end()); + os << it->second.public_addrs; ASSERT_EQ(os.str(), "192.168.1.12:6789/0"); os.str(""); - it = monmap.mon_addr.find("mon.c"); - ASSERT_NE(it, monmap.mon_addr.end()); - os << it->second; + it = monmap.mon_info.find("mon.c"); + ASSERT_NE(it, monmap.mon_info.end()); + os << it->second.public_addrs; ASSERT_EQ(os.str(), "192.168.1.13:6789/0"); } -- 2.39.5