Skip to content

Commit

Permalink
Update test suite
Browse files Browse the repository at this point in the history
  • Loading branch information
textbook committed Apr 17, 2016
1 parent 1fd8fd6 commit f6cc575
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 11 deletions.
2 changes: 1 addition & 1 deletion flash/services/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def define_services(config):
for settings in config:
name = settings['name']
if name not in SERVICES:
logger.warning('unknown service {!r}'.format(name))
logger.warning('unknown service %r', name)
continue
services[uuid4().hex] = SERVICES[name].from_config(**settings)
return services
8 changes: 0 additions & 8 deletions tests/services/test_define_service.py

This file was deleted.

14 changes: 12 additions & 2 deletions tests/test_utility_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,12 @@
def test_parse_config_from_env(logger, getenv, define_services):
result = parse_config()

assert result == {'name': 'foo', 'services': define_services.return_value}
assert result == {
'name': 'foo',
'project_name': 'unnamed',
'services': define_services.return_value,
'style': 'default',
}
getenv.assert_called_once_with('FLASH_CONFIG')
logger.info.assert_called_once_with(
'loading configuration from environment',
Expand All @@ -27,7 +32,12 @@ def test_parse_config_from_env(logger, getenv, define_services):
def test_parse_config_from_file(logger, getenv, define_services):
result = parse_config()

assert result == {'name': 'foo', 'services': define_services.return_value}
assert result == {
'name': 'foo',
'project_name': 'unnamed',
'services': define_services.return_value,
'style': 'default',
}
getenv.assert_called_once_with('FLASH_CONFIG')
logger.info.assert_called_once_with('loading configuration from file')
define_services.assert_called_once_with([])
Expand Down

0 comments on commit f6cc575

Please sign in to comment.