]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[2155] checkCountersAllZeroExcept() returns void
authorYoshitaka Aharen <aharen@jprs.co.jp>
Wed, 10 Oct 2012 09:40:50 +0000 (18:40 +0900)
committerYoshitaka Aharen <aharen@jprs.co.jp>
Thu, 15 Nov 2012 07:11:19 +0000 (16:11 +0900)
Conflicts:
src/bin/auth/tests/statistics_unittest.cc.pre

src/bin/auth/tests/statistics_unittest.cc.pre

index 8bf68b3fbd262f0435a36b964f486815e05d27bc..22881f8368830945e4e5563abef4a04904b5f8bd 100644 (file)
@@ -76,7 +76,9 @@ flatten(std::map<std::string, int>& flat_map, const std::string& prefix,
     }
 }
 
-bool
+// Test if the values of the counters are all zero except for the items
+// specified in except_for.
+void
 checkCountersAllZeroExcept(const isc::data::ConstElementPtr counters,
                            const std::set<std::string>& except_for) {
     std::map<std::string, int> stats_map;
@@ -95,8 +97,6 @@ checkCountersAllZeroExcept(const isc::data::ConstElementPtr counters,
             << i->first << " = " << expect << ", actual: "
             << i->second;
     }
-
-    return false;
 }
 
 TEST_F(CountersTest, incrementNormalQuery) {