BIND 10 trac2225_xfrout, updated. 529b8c2681f7d7cfe1aeffd640974365d15efdf7 [2225_xfrout] changed the test condition for "socket/unixdomain/open" counter of Xfrout

[BIND 10 source code commits]

The branch, trac2225_xfrout has been updated
  discards  837f75f80a4eeccbb854e134034dca8c6e9543c9 (commit)
  discards  f6dacc177212eee8440fbf18218ad0c4303c442e (commit)
  discards  e7c57c5c90e4e9931ea4e844d1cd42ae61ca22c9 (commit)
  discards  265c62fe84a7a54a288e34e3c61814bc21a7c15d (commit)
  discards  9b0b7bd0cc84d593efe2c3fca1105a0951788211 (commit)
  discards  ceab71848547f033f423d445c9d97c3149e170d2 (commit)
  discards  dbbf561204c8f6e5dc1da8a4c8a84bb0fcb88606 (commit)
  discards  47c20da94f7cadc4c5085b5630a3c4d23668f950 (commit)
  discards  81c6d50647cce42bf9a3a641084a8ad1c6660844 (commit)
  discards  c7f00d050b9241b26bdbb6127102dfe022dbd9ef (commit)
  discards  bda10c69e1c38bb770a01dfa4a9ffcb18621d132 (commit)
  discards  07c5c17a3ef03ae828c78cda46c528bafad94da6 (commit)
  discards  7d0cbebf0d56606a3ba5e3f83878f8c35e6c313e (commit)
  discards  5f2de1b1116d129e7602857df2b1d5102286a063 (commit)
       via  529b8c2681f7d7cfe1aeffd640974365d15efdf7 (commit)
       via  99d3c63b01f430ab81a3df6ca9c6d7055f0c0003 (commit)
       via  ed8de8bbec5b3b9baeb7a1c70f8d3fb2abb1a8a7 (commit)
       via  11134870039ba7bda75739c83ce2de8edf746bf3 (commit)
       via  4cf0863d36c2b6572bacf37b82bacc9e0b525392 (commit)
       via  1afa5e942075c5d7470cfe329a2a97320816ff24 (commit)
       via  c9b3ae1c60a7cbb31f36b6f195775b27ba585939 (commit)
       via  c82559684744a7cd85755f18c27613b8c434f14b (commit)
       via  4476f273780443fe042668d5639c2a1b2ef9f551 (commit)
       via  3edf52a598f22710ba6b134bf32ab2799f4c8dcc (commit)
       via  5610cf56bbb3a8942e4393cdd47b21822cdb95a5 (commit)
       via  e85e141b985297073896c381d516b18036b34f2d (commit)
       via  2564478e986da20e79849adb9e5b5c4e18f5c9fd (commit)
       via  36234910d301d16d71bbcb9b044ffc0c87081d32 (commit)
       via  0a10b2ed25935e83cd0402ae4df81e6d321d75e8 (commit)
       via  78a4e4cd8735ad72dcaafe9701482c34d72fef3e (commit)
       via  d834a1a1b95f67b2ea2467b75e00fdfe9ac0c763 (commit)
       via  abd4fe9ffe48402cafdac9c1145f25c43da62332 (commit)
       via  2c8b5b294bf5498b9525dcc1dcba7ca1869f01b6 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (837f75f80a4eeccbb854e134034dca8c6e9543c9)
            \
             N -- N -- N (529b8c2681f7d7cfe1aeffd640974365d15efdf7)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 529b8c2681f7d7cfe1aeffd640974365d15efdf7
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Mon Nov 26 16:15:03 2012 +0900

    [2225_xfrout] changed the test condition for "socket/unixdomain/open" counter of Xfrout
    
    because its counter would probably return 0 or 1 depending on timing

commit 99d3c63b01f430ab81a3df6ca9c6d7055f0c0003
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Mon Nov 26 15:58:09 2012 +0900

    [2225_xfrout] rename module name(counter) to class name(Counter)

commit ed8de8bbec5b3b9baeb7a1c70f8d3fb2abb1a8a7
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Wed Sep 12 16:29:21 2012 +0900

    [2252] added checking DataNotFoundError is raised
    
    If un-incremented counter is referred, DataNotFoundError exception
    must be raised.

commit 11134870039ba7bda75739c83ce2de8edf746bf3
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Fri Sep 28 14:19:52 2012 +0900

    [2225] added a new scenario which a slave isn't started

commit 4cf0863d36c2b6572bacf37b82bacc9e0b525392
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Fri Sep 28 13:17:00 2012 +0900

    [2225] added same tests as the above tests

commit 1afa5e942075c5d7470cfe329a2a97320816ff24
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Fri Sep 28 11:13:49 2012 +0900

    [2225] removed duplicate tests

commit c9b3ae1c60a7cbb31f36b6f195775b27ba585939
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Mon Sep 3 18:58:47 2012 +0900

    [2225] corrected the wrong place to count receive errors of a unix socket
    
    moved the counter from handle_request() to _select_loop() and revised the
    related unit test

commit c82559684744a7cd85755f18c27613b8c434f14b
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Fri Aug 31 14:48:52 2012 +0900

    [2225] added descriptions about unixsocket counters into the manpage

commit 4476f273780443fe042668d5639c2a1b2ef9f551
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Fri Aug 31 12:16:17 2012 +0900

    [2225] added checks for statistics unixsocket counters

commit 3edf52a598f22710ba6b134bf32ab2799f4c8dcc
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Fri Aug 31 14:31:31 2012 +0900

    [2225] changed according the changes of the counter class
    
     - implemented a dummy counter class inside of the notifyout test and made it
       use it.

commit 5610cf56bbb3a8942e4393cdd47b21822cdb95a5
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Fri Aug 31 12:13:10 2012 +0900

    [2225] changed the format of the debug when revised getstats command
    
     - output content of answer to the stats module with the debug message

commit e85e141b985297073896c381d516b18036b34f2d
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Mon Nov 19 14:31:36 2012 +0900

    [2225] removed obsoleted classes from xfrout.py and xfrout_test.py
    
    XfroutCounter class and TestXfroutCounter are removed

commit 2564478e986da20e79849adb9e5b5c4e18f5c9fd
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Thu Nov 22 18:56:28 2012 +0900

    [2252] fixed the spec file path of Xfrin for unittesting
    
    SPECFILE_LOCATION was located under the B10_FROM_SOURCE tree

commit 36234910d301d16d71bbcb9b044ffc0c87081d32
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Mon Nov 19 14:31:31 2012 +0900

    [2225] add unixdomain socket as statistics spec

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

Summary of changes:
 .../python/isc/statistics/tests/counter_test.py    |   32 +++++++++++++++++---
 1 file changed, 27 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/python/isc/statistics/tests/counter_test.py b/src/lib/python/isc/statistics/tests/counter_test.py
index 0837190..947bd41 100644
--- a/src/lib/python/isc/statistics/tests/counter_test.py
+++ b/src/lib/python/isc/statistics/tests/counter_test.py
@@ -146,8 +146,8 @@ class TestBasicMethods(unittest.TestCase):
                                  timer_name), 0)
 
 class BaseTestCounter():
-    imp.reload(counter)
     def setUp(self):
+        imp.reload(counter)
         self._module_spec = isc.config.module_spec_from_file(
             self.TEST_SPECFILE_LOCATION)
         self.counter = counter.Counter.init(self.TEST_SPECFILE_LOCATION)
@@ -160,6 +160,9 @@ class BaseTestCounter():
         self._zones_item_list   = self.counter._zones_item_list
         self._started = threading.Event()
 
+    def tearDown(self):
+        self.counter.clear_counters()
+
     def test_perzone_counters(self):
         # for per-zone counters
         for counter_name in self._zones_item_list:
@@ -261,6 +264,13 @@ class BaseTestCounter():
         self.check_dump_statistics()
 
     def test_perzone_timers(self):
+        # should not do this test unless there is no timer
+        # parameter(time_to_xxx) in statistics spec
+        has_timer = False
+        for counter_name in self._zones_item_list:
+            if counter_name.find('time_to_') == 0:
+                has_timer = True
+        if not has_timer: return
         # for timer counters
         for counter_name in self._zones_item_list:
             if counter_name.find('time_to_') == -1:
@@ -292,7 +302,7 @@ class BaseTestCounter():
         self.check_dump_statistics()
 
     def test_ipsocket_counters(self):
-        # for unixsocket counters
+        # for ipsocket counters
         for counter_name in self._ipsocket_names:
             incrementer = self.counter._to_global\
                 ['inc_%ssocket_%s' % counter_name]
@@ -312,14 +322,26 @@ class BaseTestCounter():
                 'socket/%s/tcp/%s' % counter_name, 2)
         self.check_dump_statistics()
 
-class TestCounter1(BaseTestCounter, unittest.TestCase):
+class TestCounter1(unittest.TestCase, BaseTestCounter):
     TEST_SPECFILE_LOCATION = TESTDATA_SRCDIR + os.sep + 'test_spec1.spec'
+    def setUp(self):
+        BaseTestCounter.setUp(self)
+    def tearDown(self):
+        BaseTestCounter.tearDown(self)
 
-class TestCounter2(BaseTestCounter, unittest.TestCase):
+class TestCounter2(unittest.TestCase, BaseTestCounter):
     TEST_SPECFILE_LOCATION = TESTDATA_SRCDIR + os.sep + 'test_spec2.spec'
+    def setUp(self):
+        BaseTestCounter.setUp(self)
+    def tearDown(self):
+        BaseTestCounter.tearDown(self)
 
-class TestCounter3(BaseTestCounter, unittest.TestCase):
+class TestCounter3(unittest.TestCase, BaseTestCounter):
     TEST_SPECFILE_LOCATION = TESTDATA_SRCDIR + os.sep + 'test_spec3.spec'
+    def setUp(self):
+        BaseTestCounter.setUp(self)
+    def tearDown(self):
+        BaseTestCounter.tearDown(self)
 
 if __name__== "__main__":
     unittest.main()