sys.exit rather than throwing an assertion error

Assertions should only be used in tests - they can be disabled at
runtime by setting the python flag -O (though I don't believe we use
that flag under normal circumstances).

also clean up test asserts - mock_redis is the redis object, so its
`called` property will always be false, because we never say
`redis_store()`. Rather, we should use the `mock_calls` property to
see all calls to all of its children
This commit is contained in:
Leo Hemsted
2018-04-09 11:45:43 +01:00
parent ba612b0f5b
commit ac0b2d79a2
2 changed files with 16 additions and 8 deletions

View File

@@ -12,10 +12,12 @@ from tests.app.db import create_notification, create_template, create_service
def test_populate_redis_template_usage_does_nothing_if_redis_disabled(mocker, notify_api, sample_service):
mock_redis = mocker.patch('app.commands.redis_store')
with set_config(notify_api, 'REDIS_ENABLED', False):
with pytest.raises(AssertionError):
with pytest.raises(SystemExit) as exit_signal:
populate_redis_template_usage.callback.__wrapped__(sample_service.id, datetime.utcnow())
assert not mock_redis.called
assert mock_redis.mock_calls == []
# sys.exit with nonzero exit code
assert exit_signal.value.code != 0
def test_populate_redis_template_usage_does_nothing_if_no_data(mocker, notify_api, sample_service):
@@ -23,7 +25,7 @@ def test_populate_redis_template_usage_does_nothing_if_no_data(mocker, notify_ap
with set_config(notify_api, 'REDIS_ENABLED', True):
populate_redis_template_usage.callback.__wrapped__(sample_service.id, datetime.utcnow())
assert not mock_redis.called
assert mock_redis.mock_calls == []
@freeze_time('2017-06-12')
@@ -41,7 +43,8 @@ def test_populate_redis_template_usage_only_populates_for_today(mocker, notify_a
mock_redis.set_hash_and_expire.assert_called_once_with(
'service-{}-template-usage-2017-06-10'.format(sample_template.service_id),
{str(sample_template.id): 3},
notify_api.config['EXPIRE_CACHE_EIGHT_DAYS']
notify_api.config['EXPIRE_CACHE_EIGHT_DAYS'],
raise_exception=True
)
@@ -65,5 +68,6 @@ def test_populate_redis_template_usage_only_populates_for_given_service(mocker,
mock_redis.set_hash_and_expire.assert_called_once_with(
'service-{}-template-usage-2017-06-10'.format(s1.id),
{str(t1.id): 2},
notify_api.config['EXPIRE_CACHE_EIGHT_DAYS']
notify_api.config['EXPIRE_CACHE_EIGHT_DAYS'],
raise_exception=True
)