BIND 10 trac648, updated. 9d42d008eb9ab1a9f271c7c20754ba02785772f0 [trac648] Whitespace fixes
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Mar 7 14:58:45 UTC 2011
The branch, trac648 has been updated
via 9d42d008eb9ab1a9f271c7c20754ba02785772f0 (commit)
from f1a6ba985d60a31bb5cffe0571c827c3f7b25ce3 (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 9d42d008eb9ab1a9f271c7c20754ba02785772f0
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Mon Mar 7 16:00:49 2011 +0100
[trac648] Whitespace fixes
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 2 +-
src/bin/bind10/bind10.py.in | 8 ++++----
src/bin/bind10/tests/Makefile.am | 4 ++--
src/bin/bind10/tests/bind10_cmd_test.py | 10 +++++-----
4 files changed, 12 insertions(+), 12 deletions(-)
-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 7dee4d0..695c142 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
XXX. [func] shane
- Add the ability to list the running BIND 10 processes using the
+ Add the ability to list the running BIND 10 processes using the
command channel. To try this, use "Boss show_processes".
(Trac #648, git yyy)
diff --git a/src/bin/bind10/bind10.py.in b/src/bin/bind10/bind10.py.in
index 676ff2b..1a188fa 100755
--- a/src/bin/bind10/bind10.py.in
+++ b/src/bin/bind10/bind10.py.in
@@ -275,7 +275,7 @@ class BoB:
pids.sort()
process_list = [ ]
for pid in pids:
- process_list.append([ pid, self.processes[pid].name ])
+ process_list.append([pid, self.processes[pid].name])
return process_list
def command_handler(self, command, args):
@@ -291,11 +291,11 @@ class BoB:
elif command == "ping":
answer = isc.config.ccsession.create_answer(0, "pong")
elif command == "show_processes":
- answer = isc.config.ccsession.create_answer(0,
- self.get_processes())
+ answer = isc.config.ccsession. \
+ create_answer(0, self.get_processes())
else:
print("should be doing the unknown command thingy")
- answer = isc.config.ccsession.create_answer(1,
+ answer = isc.config.ccsession.create_answer(1,
"Unknown command")
return answer
diff --git a/src/bin/bind10/tests/Makefile.am b/src/bin/bind10/tests/Makefile.am
index dbb59e0..0dd18ee 100644
--- a/src/bin/bind10/tests/Makefile.am
+++ b/src/bin/bind10/tests/Makefile.am
@@ -13,6 +13,6 @@ endif
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/bin/bind10 \
- BIND10_MSGQ_SOCKET_FILE=$(abs_top_builddir)/msgq_socket \
- $(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
+ BIND10_MSGQ_SOCKET_FILE=$(abs_top_builddir)/msgq_socket \
+ $(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
done
diff --git a/src/bin/bind10/tests/bind10_cmd_test.py b/src/bin/bind10/tests/bind10_cmd_test.py
index ce27c3a..4fe28b3 100644
--- a/src/bin/bind10/tests/bind10_cmd_test.py
+++ b/src/bin/bind10/tests/bind10_cmd_test.py
@@ -11,17 +11,17 @@ BIND10_EXE="../run_bind10.sh"
TIMEOUT=3
def _waitForString(bob, s):
- """Read the input from the Process object until we find the
+ """Read the input from the Process object until we find the
string we're looking for or we timeout."""
found_string = False
start_time = time.time()
while time.time() < start_time + TIMEOUT:
- (r,w,x) = select.select((bob.stdout,), (), (), TIMEOUT)
+ (r,w,x) = select.select((bob.stdout,), (), (), TIMEOUT)
if bob.stdout in r:
s = bob.stdout.readline()
if s == '':
break
- if s.startswith(s):
+ if s.startswith(s):
found_string = True
break
return found_string
@@ -93,7 +93,7 @@ class TestBossCmd(unittest.TestCase):
# connect to the command channel
self.cc = isc.cc.Session()
self.cc.group_subscribe('Boss')
-
+
# send a ping
cmd = { "command": ['show_processes']}
seq = self.cc.group_sendmsg(cmd, 'Boss')
@@ -110,7 +110,7 @@ class TestBossCmd(unittest.TestCase):
if __name__ == '__main__':
- # Python 3.2 and later support the setUpClass() and tearDownClass()
+ # Python 3.2 and later support the setUpClass() and tearDownClass()
# class methods to unittest, which are what we want to avoid having
# to start/stop BIND 10 every time we run the test. For versions of
# unittest that do not support this, we invoke them explicitly
More information about the bind10-changes
mailing list