Skip to content

Commit

Permalink
Renamed load_config function to be more readable (#128)
Browse files Browse the repository at this point in the history
* Renamed to `load_modules_from_config`
  • Loading branch information
jacobtomlinson committed Mar 25, 2017
1 parent 522bd04 commit 09b223f
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
3 changes: 2 additions & 1 deletion opsdroid/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ def load(self):

def start_loop(self):
"""Start the event loop."""
connectors, databases, skills = self.loader.load_config(self.config)
connectors, databases, skills = \
self.loader.load_modules_from_config(self.config)
if databases is not None:
self.start_databases(databases)
self.setup_skills(skills)
Expand Down
2 changes: 1 addition & 1 deletion opsdroid/loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ def load_config_file(self, config_paths):
except FileNotFoundError as error:
self.opsdroid.critical(str(error), 1)

def load_config(self, config):
def load_modules_from_config(self, config):
"""Load all module types based on config."""
_LOGGER.debug("Loading modules from config")

Expand Down
3 changes: 2 additions & 1 deletion tests/test_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ def test_start_loop(self):
mockconfig = {}, {}, {}
opsdroid.web_server = mock.Mock()
opsdroid.loader = mock.Mock()
opsdroid.loader.load_config = mock.Mock(return_value=mockconfig)
opsdroid.loader.load_modules_from_config = \
mock.Mock(return_value=mockconfig)
opsdroid.start_databases = mock.Mock()
opsdroid.setup_skills = mock.Mock()
opsdroid.start_connector_tasks = mock.Mock()
Expand Down
4 changes: 2 additions & 2 deletions tests/test_loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,15 +131,15 @@ def test_load_config(self):
config['connectors'] = mock.MagicMock()
config['module-path'] = self._tmp_dir + "/opsdroid"

loader.load_config(config)
loader.load_modules_from_config(config)
self.assertEqual(len(loader._load_modules.mock_calls), 3)

def test_load_empty_config(self):
opsdroid, loader = self.setup()
loader._load_modules = mock.MagicMock()
config = {}

loader.load_config(config)
loader.load_modules_from_config(config)
self.assertEqual(len(loader._load_modules.mock_calls), 0)
self.assertEqual(len(opsdroid.mock_calls), 2)

Expand Down

0 comments on commit 09b223f

Please sign in to comment.