diff --git a/ckan/lib/email_notifications.py b/ckan/lib/email_notifications.py index e279ccb1f70..14f72907f6b 100644 --- a/ckan/lib/email_notifications.py +++ b/ckan/lib/email_notifications.py @@ -54,7 +54,7 @@ def string_to_timedelta(s): break if not match: - raise ckan.logic.ParameterError('Not a valid time: {0}'.format(s)) + raise logic.ParameterError('Not a valid time: {0}'.format(s)) gd = match.groupdict() days = int(gd.get('days', '0')) diff --git a/ckan/tests/lib/test_email_notifications.py b/ckan/tests/lib/test_email_notifications.py index 525aa883ab3..9e3a284c11d 100644 --- a/ckan/tests/lib/test_email_notifications.py +++ b/ckan/tests/lib/test_email_notifications.py @@ -7,7 +7,10 @@ ''' import datetime +import nose.tools + import ckan.lib.email_notifications as email_notifications +import ckan.logic as logic def test_string_to_time_delta(): @@ -39,3 +42,5 @@ def test_string_to_time_delta(): minutes=23, seconds=34, milliseconds=87, microseconds=465) assert email_notifications.string_to_timedelta('.123456') == ( datetime.timedelta(milliseconds=123, microseconds=456)) + nose.tools.assert_raises(logic.ParameterError, + email_notifications.string_to_timedelta, 'foobar')