Changed email test to handle deferred sendings (refs #21068).

tests/test_email.py

@@ -88,16 +88,23 @@ def send_test_email():
     print('Sending test email to "%s".' % email)
     cmd = 'echo "This is a test email" | mail -s "Test email from `cat /etc/hostname`" %s' % email
     subprocess.getstatusoutput(cmd)
-    time.sleep(3)
+    timeout = 120
+    waited = 2
+    out = ''
     cmd = 'grep "%s" /var/log/mail.log' % email
-    status, out = subprocess.getstatusoutput(cmd)
-    if status != 0:
-        time.sleep(7)
+    while True:
         status, out = subprocess.getstatusoutput(cmd)
-        if status != 0:
+        if status == 0:
+            out = out.strip().split('\n')[-1]
+            if 'status=deferred' not in out:
+                break
+        if waited >= timeout:
             print_red('Failed to send email.')
-            print('No log entry found using command: %s' % cmd)
+            print('No log entry found after %s seconds using command: %s' % (waited, cmd))
             return 1
+        print('Waiting %s seconds for email sending status.' % waited)
+        time.sleep(waited)
+        waited *= 2
     if 'bounced' not in out or 'The email account that you tried to reach does not exist.' in out:
         print_green('Email sent.')
         return 0