Commit 9f854755 authored by Michal 'vorner' Vaner's avatar Michal 'vorner' Vaner
Browse files

[213] Cleanups

parent 5c16ff47
......@@ -392,11 +392,15 @@ class BoB:
self.processes[pid].kill(True)
self.processes = {}
def read_bind10_config(self):
def _read_bind10_config(self):
"""
Reads the parameters associated with the BoB module itself.
This means the list of components we should start now.
This could easily be combined into start_all_processes, but
it stays because of historical reasons and because the tests
replace the method sometimes.
"""
logger.info(BIND10_READING_BOSS_CONFIGURATION)
......@@ -673,13 +677,12 @@ class BoB:
# Connect to the msgq. This is not a process, so it's not handled
# inside the configurator.
c_channel_env = self.c_channel_env
self.start_ccsession(c_channel_env)
self.start_ccsession(self.c_channel_env)
# Extract the parameters associated with Bob. This can only be
# done after the CC Session is started. Note that the logging
# configuration may override the "-v" switch set on the command line.
self.read_bind10_config()
self._read_bind10_config()
# TODO: Return the dropping of privileges
......
......@@ -244,7 +244,7 @@ class MockBob(BoB):
def stop_creator(self, kill=False):
self.creator = False
def read_bind10_config(self):
def _read_bind10_config(self):
# Configuration options are set directly
pass
......@@ -945,7 +945,7 @@ class TestBossComponents(unittest.TestCase):
# Start it
bob._component_configurator.reconfigure = self.__unary_hook
# We need to return the original read_bind10_config
bob.read_bind10_config = lambda: BoB.read_bind10_config(bob)
bob._read_bind10_config = lambda: BoB._read_bind10_config(bob)
# And provide a session to read the data from
class CC:
pass
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment