BIND 10 trac213, updated. 7f150769d5e3485cd801f0b5ab9b1d3b25aae520 [213] some minor editorial fixes
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Oct 20 04:08:49 UTC 2011
The branch, trac213 has been updated
via 7f150769d5e3485cd801f0b5ab9b1d3b25aae520 (commit)
via 6215c5929bdd6fbb708fd0a2ee034250aa5cc065 (commit)
from d83a117a090eaf417698eea6697ae750dc45c135 (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 7f150769d5e3485cd801f0b5ab9b1d3b25aae520
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Wed Oct 19 21:08:33 2011 -0700
[213] some minor editorial fixes
commit 6215c5929bdd6fbb708fd0a2ee034250aa5cc065
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Mon Oct 17 20:54:17 2011 -0700
[213] minor editorial fix: moved the module description before imports.
(otherwise this wouldn't considered the module description in pydoc)
-----------------------------------------------------------------------
Summary of changes:
src/bin/bind10/bind10_messages.mes | 2 +-
src/lib/python/isc/bind10/component.py | 20 ++++++++++----------
src/lib/python/isc/bind10/tests/component_test.py | 14 +++++++-------
3 files changed, 18 insertions(+), 18 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/bind10/bind10_messages.mes b/src/bin/bind10/bind10_messages.mes
index 501a515..a8a7ec2 100644
--- a/src/bin/bind10/bind10_messages.mes
+++ b/src/bin/bind10/bind10_messages.mes
@@ -57,7 +57,7 @@ real work yet, it just does the planning what needs to be done.
% BIND10_CONFIGURATOR_PLAN_INTERRUPTED configurator plan interrupted, only %1 of %2 done
There was an exception during some planned task. The plan will not continue and
only some tasks of the plan were completed. The rest is aborted. The exception
-will propagate.
+will be propagated.
% BIND10_CONFIGURATOR_RECONFIGURE reconfiguring running components
A different configuration of which components should be running is being
diff --git a/src/lib/python/isc/bind10/component.py b/src/lib/python/isc/bind10/component.py
index b37a235..0fbe21d 100644
--- a/src/lib/python/isc/bind10/component.py
+++ b/src/lib/python/isc/bind10/component.py
@@ -13,6 +13,15 @@
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+"""
+Module for managing components (abstraction of process). It allows starting
+them in given order, handling when they crash (what happens depends on kind
+of component) and shutting down. It also handles the configuration of this.
+
+Dependencies between them are not yet handled. It might turn out they are
+needed, in that case they will be added sometime in future.
+"""
+
import isc.bind10.sockcreator
import isc.log
from isc.log_messages.bind10_messages import *
@@ -24,15 +33,6 @@ logger = isc.log.Logger("boss")
DBG_TRACE_DATA = 20
DBG_TRACE_DETAILED = 80
-"""
-Module for managing components (abstraction of process). It allows starting
-them in given order, handling when they crash (what happens depends on kind
-of component) and shutting down. It also handles the configuration of this.
-
-Dependencies between them are not yet handled. It might turn out they are
-needed, in that case they will be added sometime in future.
-"""
-
class Component:
"""
This represents a single component. It has some defaults of behaviour,
@@ -438,7 +438,7 @@ class Configurator:
component.stop()
del self._components[task['name']]
else:
- # Can Not Happen (as the plans are generated by ourself).
+ # Can Not Happen (as the plans are generated by ourselves).
# Therefore not tested.
raise NotImplementedError("Command unknown: " + command)
done += 1
diff --git a/src/lib/python/isc/bind10/tests/component_test.py b/src/lib/python/isc/bind10/tests/component_test.py
index e183437..8af8ec4 100644
--- a/src/lib/python/isc/bind10/tests/component_test.py
+++ b/src/lib/python/isc/bind10/tests/component_test.py
@@ -32,11 +32,11 @@ class TestError(Exception):
class BossUtils:
"""
A class that brings some utilities for pretending we're Boss.
- This is expected to be inherited by the testcases themself.
+ This is expected to be inherited by the testcases themselves.
"""
def setUp(self):
"""
- Part of setup. Should be called by descendand's setUp.
+ Part of setup. Should be called by descendant's setUp.
"""
self._shutdown = False
self._exitcode = None
@@ -45,7 +45,7 @@ class BossUtils:
def tearDown(self):
"""
- Clean up after tests. If the descendand implements a tearDown, it
+ Clean up after tests. If the descendant implements a tearDown, it
should call this method internally.
"""
# Return the original time function
@@ -209,7 +209,7 @@ class ComponentTests(BossUtils, unittest.TestCase):
def __do_start_stop(self, kind):
"""
- This is a body of a test. It creates a componend of given kind,
+ This is a body of a test. It creates a component of given kind,
then starts it and stops it. It checks correct functions are called
and the component's status is correct.
@@ -281,7 +281,7 @@ class ComponentTests(BossUtils, unittest.TestCase):
component.start()
self.__check_started(component)
self._timeskip()
- # Pretend the componend died some time later
+ # Pretend the component died some time later
component.failed()
# Check the component is still dead
self.__check_dead(component)
@@ -382,7 +382,7 @@ class ComponentTests(BossUtils, unittest.TestCase):
def test_bad_kind(self):
"""
- Test the component rejects nonsensual kinds. This includes bad
+ Test the component rejects nonsensical kinds. This includes bad
capitalization.
"""
for kind in ['Core', 'CORE', 'nonsense', 'need ed', 'required']:
@@ -632,7 +632,7 @@ class ConfiguratorTest(BossUtils, unittest.TestCase):
self.assertEqual([1, 2], component._params)
self.assertEqual('address', component._address)
self.assertEqual('needed', component._kind)
- # We don't use isinstance on purpose, it would allow a descendand
+ # We don't use isinstance on purpose, it would allow a descendant
self.assertTrue(type(component) is Component)
plan = configurator._build_plan({}, {
'component': { }
More information about the bind10-changes
mailing list