The branch, trac1086 has been updated
via 37e3ef0278c0f52a2e211b72d9b39e7e25262b43 (commit)
from 716006fe1be4edaf841b94d488cd1d8cbbda116e (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 37e3ef0278c0f52a2e211b72d9b39e7e25262b43
Author: Jelte Jansen <jelte at isc.org>
Date: Tue Mar 26 09:44:02 2013 +0100
[1086] Fix wrong addressformatter call
and add test for it
-----------------------------------------------------------------------
Summary of changes:
src/bin/bind10/init.py.in | 2 +-
src/bin/bind10/tests/init_test.py.in | 10 ++++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
-----------------------------------------------------------------------
diff --git a/src/bin/bind10/init.py.in b/src/bin/bind10/init.py.in
index 7505eb6..e57971a 100755
--- a/src/bin/bind10/init.py.in
+++ b/src/bin/bind10/init.py.in
@@ -429,7 +429,7 @@ class Init:
port)
else:
logger.info(BIND10_STARTING_PROCESS_PORT_ADDRESS,
- self.curproc, AddressFormatter(address, port))
+ self.curproc, AddressFormatter((address, port)))
def log_started(self, pid = None):
"""
diff --git a/src/bin/bind10/tests/init_test.py.in b/src/bin/bind10/tests/init_test.py.in
index 9a591ef..f384865 100644
--- a/src/bin/bind10/tests/init_test.py.in
+++ b/src/bin/bind10/tests/init_test.py.in
@@ -2339,6 +2339,16 @@ class SocketSrvTest(unittest.TestCase):
self.assertEqual({}, self.__b10_init._unix_sockets)
self.assertTrue(sock.closed)
+ def test_log_starting(self):
+ """
+ Checks the log_starting call doesn't raise any errors
+ (does not check actual log output)
+ """
+ self.__b10_init.log_starting("foo")
+ self.__b10_init.log_starting("foo", 1)
+ self.__b10_init.log_starting("foo", 1, "192.0.2.1")
+
+
class TestFunctions(unittest.TestCase):
def setUp(self):
self.lockfile_testpath = \