fix: corrected flush job for passing test_flush

This commit is contained in:
Abhishek Kedar 2020-04-27 18:25:16 +05:30 committed by GitHub
parent 47446469bd
commit fda7a45c52
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -348,17 +348,20 @@ def flush(from_test=False):
smtpserver = SMTPServer()
smtpserver_dict[email.sender] = smtpserver
send_one_args = {
'email': email.name,
'smtpserver': smtpserver,
'auto_commit': auto_commit,
'from_test': from_test
}
enqueue(
method = 'frappe.email.queue.send_one',
queue = 'short',
**send_one_args
)
if from_test:
send_one(email.name, smtpserver, auto_commit, from_test=from_test)
else:
send_one_args = {
'email': email.name,
'smtpserver': smtpserver,
'auto_commit': auto_commit,
'from_test': from_test
}
enqueue(
method = 'frappe.email.queue.send_one',
queue = 'short',
**send_one_args
)
# NOTE: removing commit here because we pass auto_commit
# finally:
@ -387,8 +390,13 @@ def send_one(email, smtpserver=None, auto_commit=True, now=False, from_test=Fals
`tabEmail Queue`
where
name=%s
for update''', email, as_dict=True)[0]
for update''', email, as_dict=True)
if len(email):
email = email[0]
else:
return
recipients_list = frappe.db.sql('''select name, recipient, status from
`tabEmail Queue Recipient` where parent=%s''', email.name, as_dict=1)