BIND 10 trac2225_xfrout, updated. d48e433c30b683d066d5947a34364be8eaafeb6b [2225_xfrout] changed the test condition for "socket/unixdomain/open" counter of Xfrout
BIND 10 source code commits
bind10-changes at lists.isc.org
Tue Nov 27 08:43:40 UTC 2012
The branch, trac2225_xfrout has been updated
discards 529b8c2681f7d7cfe1aeffd640974365d15efdf7 (commit)
discards 99d3c63b01f430ab81a3df6ca9c6d7055f0c0003 (commit)
discards ed8de8bbec5b3b9baeb7a1c70f8d3fb2abb1a8a7 (commit)
discards 11134870039ba7bda75739c83ce2de8edf746bf3 (commit)
discards 4cf0863d36c2b6572bacf37b82bacc9e0b525392 (commit)
discards 1afa5e942075c5d7470cfe329a2a97320816ff24 (commit)
discards c9b3ae1c60a7cbb31f36b6f195775b27ba585939 (commit)
discards c82559684744a7cd85755f18c27613b8c434f14b (commit)
discards 4476f273780443fe042668d5639c2a1b2ef9f551 (commit)
discards 3edf52a598f22710ba6b134bf32ab2799f4c8dcc (commit)
discards 5610cf56bbb3a8942e4393cdd47b21822cdb95a5 (commit)
discards e85e141b985297073896c381d516b18036b34f2d (commit)
discards 2564478e986da20e79849adb9e5b5c4e18f5c9fd (commit)
discards 36234910d301d16d71bbcb9b044ffc0c87081d32 (commit)
via d48e433c30b683d066d5947a34364be8eaafeb6b (commit)
via edcc41946b244c7a47d7e70a32ccb2759ecec424 (commit)
via d8603fcdf49691085632d29cef57895574cb0b93 (commit)
via df8e406aa20bdf7d3f551714a1f0da9e7836a1c3 (commit)
via 70be41b79a198562f435cd485bf3a5cc007bf0b9 (commit)
via fc1ba72dbb3edffa256bfd9771f37c49185f52e6 (commit)
via a59c55245028a6a8a13fc49820069a705b16ec1e (commit)
via f4e0507966f2b1933ac5b888e0b793de1fc181a5 (commit)
via 9fb2682c74213c35617060482b55698580a264e6 (commit)
via 77108be34ea6fc07f6e90715684efdb7ada7894c (commit)
via fac2e182c9a7262510992b8e1d98df30e82f0b05 (commit)
via 30ed3aa224c6162137ab70baae80e3fef92d2f56 (commit)
via 6bddfe75fae2009704436eee7b70f41ddfcb874c (commit)
via cc8825b4bae289bea7ec2f40147971483f0146c4 (commit)
via ad4eae2bc3410084b4ea07dd96118c7c1da17a25 (commit)
via 36df68ce895eefd601857fa5d8e1d701137fe218 (commit)
via a9a229b2314c336cf4dd7a257371231530dbae13 (commit)
via 48625915d6898ddca0eba5b3be512b1dcb29487b (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 (529b8c2681f7d7cfe1aeffd640974365d15efdf7)
\
N -- N -- N (d48e433c30b683d066d5947a34364be8eaafeb6b)
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 d48e433c30b683d066d5947a34364be8eaafeb6b
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 edcc41946b244c7a47d7e70a32ccb2759ecec424
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 d8603fcdf49691085632d29cef57895574cb0b93
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 df8e406aa20bdf7d3f551714a1f0da9e7836a1c3
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 70be41b79a198562f435cd485bf3a5cc007bf0b9
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 fc1ba72dbb3edffa256bfd9771f37c49185f52e6
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Fri Sep 28 11:13:49 2012 +0900
[2225] removed duplicate tests
commit a59c55245028a6a8a13fc49820069a705b16ec1e
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 f4e0507966f2b1933ac5b888e0b793de1fc181a5
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 9fb2682c74213c35617060482b55698580a264e6
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 77108be34ea6fc07f6e90715684efdb7ada7894c
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 fac2e182c9a7262510992b8e1d98df30e82f0b05
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 30ed3aa224c6162137ab70baae80e3fef92d2f56
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 6bddfe75fae2009704436eee7b70f41ddfcb874c
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 cc8825b4bae289bea7ec2f40147971483f0146c4
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:
src/lib/python/isc/statistics/counter.py | 22 +++++++++++---------
.../python/isc/statistics/tests/counter_test.py | 13 +++++++++++-
2 files changed, 24 insertions(+), 11 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/python/isc/statistics/counter.py b/src/lib/python/isc/statistics/counter.py
index 5654542..22b8e4c 100644
--- a/src/lib/python/isc/statistics/counter.py
+++ b/src/lib/python/isc/statistics/counter.py
@@ -73,9 +73,6 @@ import threading
import isc.config
from datetime import datetime
-# container of a counter object
-_COUNTER = None
-
# static internal functions
def _add_counter(element, spec, identifier):
"""Returns value of the identifier if the identifier is in the
@@ -144,25 +141,30 @@ def _stop_timer(start_time, element, spec, identifier):
class Counter():
"""A counter class"""
- def init(spec_file_name):
+ # container of a counter object
+ _COUNTER = None
+
+ @classmethod
+ def init(cls, spec_file_name):
"""A creator method for a counter class. It creates a counter
object by the module name of the given spec file. An argument is a
specification file name."""
- global _COUNTER
- if isinstance(_COUNTER, _Counter):
+ if isinstance(cls._COUNTER, _Counter):
# already loaded
- return _COUNTER
+ return cls._COUNTER
# create an instance once
- _COUNTER = _Counter(spec_file_name)
+ cls._COUNTER = _Counter(spec_file_name)
# set methods in Counter
- for (k, v) in _COUNTER._to_global.items():
+ for (k, v) in cls._COUNTER._to_global.items():
setattr(Counter, k, v)
- return _COUNTER
+ return cls._COUNTER
# These method are dummies for isc.notify.notify_out.
+ @staticmethod
def inc_notifyoutv4(arg):
"""An empty method to be disclosed"""
pass
+ @staticmethod
def inc_notifyoutv6(arg):
"""An empty method to be disclosed"""
pass
diff --git a/src/lib/python/isc/statistics/tests/counter_test.py b/src/lib/python/isc/statistics/tests/counter_test.py
index 947bd41..55e59e8 100644
--- a/src/lib/python/isc/statistics/tests/counter_test.py
+++ b/src/lib/python/isc/statistics/tests/counter_test.py
@@ -146,8 +146,10 @@ class TestBasicMethods(unittest.TestCase):
timer_name), 0)
class BaseTestCounter():
- def setUp(self):
+ @classmethod
+ def setUpClass(cls):
imp.reload(counter)
+ def setUp(self):
self._module_spec = isc.config.module_spec_from_file(
self.TEST_SPECFILE_LOCATION)
self.counter = counter.Counter.init(self.TEST_SPECFILE_LOCATION)
@@ -324,6 +326,9 @@ class BaseTestCounter():
class TestCounter1(unittest.TestCase, BaseTestCounter):
TEST_SPECFILE_LOCATION = TESTDATA_SRCDIR + os.sep + 'test_spec1.spec'
+ @classmethod
+ def setUpClass(cls):
+ BaseTestCounter.setUpClass()
def setUp(self):
BaseTestCounter.setUp(self)
def tearDown(self):
@@ -331,6 +336,9 @@ class TestCounter1(unittest.TestCase, BaseTestCounter):
class TestCounter2(unittest.TestCase, BaseTestCounter):
TEST_SPECFILE_LOCATION = TESTDATA_SRCDIR + os.sep + 'test_spec2.spec'
+ @classmethod
+ def setUpClass(cls):
+ BaseTestCounter.setUpClass()
def setUp(self):
BaseTestCounter.setUp(self)
def tearDown(self):
@@ -338,6 +346,9 @@ class TestCounter2(unittest.TestCase, BaseTestCounter):
class TestCounter3(unittest.TestCase, BaseTestCounter):
TEST_SPECFILE_LOCATION = TESTDATA_SRCDIR + os.sep + 'test_spec3.spec'
+ @classmethod
+ def setUpClass(cls):
+ BaseTestCounter.setUpClass()
def setUp(self):
BaseTestCounter.setUp(self)
def tearDown(self):
More information about the bind10-changes
mailing list