BIND 10 master, updated. 227ca9fd94365eebd3d21447c821ca7ec76971f6 Unify common code

[BIND 10 source code commits]

The branch, master has been updated
       via  227ca9fd94365eebd3d21447c821ca7ec76971f6 (commit)
       via  a5db81cca25ff24aebb7c1855ecd2ee40e2f129f (commit)
       via  c2999ba2c107046eace915fab85202846b6095af (commit)
      from  434528966996239ed0f7fbe639b914d85478a515 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 227ca9fd94365eebd3d21447c821ca7ec76971f6
Author: Mukund Sivaraman <muks at isc.org>
Date:   Mon Feb 18 12:22:16 2013 +0530

    Unify common code

commit a5db81cca25ff24aebb7c1855ecd2ee40e2f129f
Merge: 4345289 c2999ba
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Mon Feb 18 16:39:23 2013 +0900

    [master] Merge branch 'trac2225_statistics_4'

-----------------------------------------------------------------------

Summary of changes:
 src/lib/python/isc/statistics/counters.py          |    4 +---
 .../python/isc/statistics/tests/counters_test.py   |   15 +++++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/python/isc/statistics/counters.py b/src/lib/python/isc/statistics/counters.py
index 99b989d..8138ab6 100644
--- a/src/lib/python/isc/statistics/counters.py
+++ b/src/lib/python/isc/statistics/counters.py
@@ -393,9 +393,7 @@ class Counters():
             for name in zones:
                 if attr in zones[name]:
                     sum_ += zones[name][attr]
-            if  sum_ > 0:
-                _set_counter(zones_data, zones_spec,
-                             id_str, sum_)
+            _set_counter(zones_data, zones_spec, id_str, sum_)
         # insert entire-server counts
         statistics_data[self._perzone_prefix] = dict(
             statistics_data[self._perzone_prefix],
diff --git a/src/lib/python/isc/statistics/tests/counters_test.py b/src/lib/python/isc/statistics/tests/counters_test.py
index 2d791c4..395a959 100644
--- a/src/lib/python/isc/statistics/tests/counters_test.py
+++ b/src/lib/python/isc/statistics/tests/counters_test.py
@@ -274,6 +274,21 @@ class BaseTestCounters():
                 self._statistics_data, '/'.join(args), 2)
         self.check_get_statistics()
 
+    def test_perzone_zero_counters(self):
+        # setting all counters to zero
+        for name in self.counters._zones_item_list:
+            args = (self._perzone_prefix, TEST_ZONE_NAME_STR, name)
+            if name.find('time_to_') == 0:
+                zero = 0.0
+            else:
+                zero = 0
+            # set zero
+            self.counters._incdec(*args, step=zero)
+            for zone_str in (self._entire_server, TEST_ZONE_NAME_STR):
+                isc.cc.data.set(self._statistics_data,
+                                '%s/%s/%s' % (args[0], zone_str, name), zero)
+        self.check_get_statistics()
+
     def test_undefined_item(self):
         # test DataNotFoundError raising when specifying item defined
         # in the specfile