Changed timeout handling for email test.

tests/test_email.py

@@ -89,26 +89,31 @@ def send_test_email():
     cmd = 'echo "This is a test email" | mail -s "Test email from `cat /etc/hostname`" %s' % email
     subprocess.getstatusoutput(cmd)
     timeout = 120
-    waited = 2
+    waited = 1
+    delay = 2
+    print('Timeout to find email sending log is set to %s seconds.' % timeout)
     out = ''
     if os.path.isfile('/var/log/mail.log'):
         cmd = 'grep "%s" /var/log/mail.log' % email
     else:
         print('/var/log/mail.log not found, trying journalctl')
         cmd = 'journalctl -u postfix | grep %s' % email
+    time.sleep(1)
     while True:
         status, out = subprocess.getstatusoutput(cmd)
         if status == 0:
             out = out.strip().split('\n')[-1]
             if 'status=deferred' not in out:
+                print('Log entry found after %s seconds.' % waited)
                 break
         if waited >= timeout:
             print_red('Failed to send email.')
             print('No log entry found after %s seconds using command: %s' % (waited, cmd))
             return 1
-        print('Waiting %s seconds for email sending status.' % (timeout - waited))
-        time.sleep(waited)
-        waited *= 2
+        print('No log entry found after %s seconds, waiting %s more seconds...' % (waited, delay))
+        time.sleep(delay)
+        waited += delay
+        delay *= 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