[#1635] Fix an email_notifications_since bug

Fix the error response when ckan.email_notifications_since is an invalid string.
ckan · Dec 17, 2012 · a3d7f5d · a3d7f5d
1 parent 5654091
commit a3d7f5d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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')