Tests passing again

Author: Ask Solem

celery/tests/test_worker_job.py

@@ -139,8 +139,8 @@ def mock_mail_admins(*args, **kwargs):
         try:
             tw = TaskRequest(mytask.name, gen_unique_id(), [1], {"f": "x"})
             try:
-                raise KeyError("foo")
-            except KeyError:
+                raise KeyError("moofoobar")
+            except:
                 einfo = ExceptionInfo(sys.exc_info())
 
             tw.on_failure(einfo)
@@ -455,7 +455,8 @@ def _test_on_failure(self, exception):
 
         logfh = StringIO()
         tw.logger.handlers = []
-        tw.logger = setup_logger(logfile=logfh, loglevel=logging.INFO)
+        tw.logger = setup_logger(logfile=logfh, loglevel=logging.INFO,
+                                 root=False)
 
         from celery import conf
         conf.CELERY_SEND_TASK_ERROR_EMAILS = True

celery/worker/job.py

@@ -434,14 +434,14 @@ def on_failure(self, exc_info):
         self.logger.error(self.error_msg.strip() % context)
 
         task_obj = tasks.get(self.task_name, object)
-        self.send_error_email(task_obj, context, exc_info.exception)
+        self.send_error_email(task_obj, context, exc_info.exception,
+                              enabled=conf.CELERY_SEND_TASK_ERROR_EMAILS,
+                              whitelist=conf.CELERY_TASK_ERROR_WHITELIST)
 
     def send_error_email(self, task, context, exc,
-            whitelist=conf.CELERY_TASK_ERROR_WHITELIST,
-            enabled=conf.CELERY_SEND_TASK_ERROR_EMAILS,
-            fail_silently=True):
+            whitelist=None, enabled=False, fail_silently=True):
         if enabled and not task.disable_error_emails:
-            if whitelist is not None:
+            if whitelist:
                 if not isinstance(exc, tuple(whitelist)):
                     return
             subject = self.email_subject.strip() % context