From 4df841fb8611db525c0f02ad6ce650aef7b40fa7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Philipp=20Sch=C3=BCle?= Date: Fri, 26 Aug 2016 15:59:05 +0200 Subject: [PATCH] improve waiting for mailserver in sendMessage tests MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I2b3691ef4829a395e8f676a4f18eab495a7b1f0d Reviewed-on: http://gerrit.tine20.com/customers/3491 Reviewed-by: Philipp Schüle Tested-by: Philipp Schüle --- tests/tine20/Felamimail/Frontend/JsonTest.php | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/tests/tine20/Felamimail/Frontend/JsonTest.php b/tests/tine20/Felamimail/Frontend/JsonTest.php index d8a2ba7..190abac 100644 --- a/tests/tine20/Felamimail/Frontend/JsonTest.php +++ b/tests/tine20/Felamimail/Frontend/JsonTest.php @@ -1556,15 +1556,21 @@ class Felamimail_Frontend_JsonTest extends TestCase { $messageToSend = $this->_getMessageData(); $messageToSend['headers'] = array_merge($messageToSend['headers'], $addtionalHeaders); - $returned = $this->_json->saveMessage($messageToSend); + $this->_json->saveMessage($messageToSend); $this->_foldersToClear = array('INBOX', $this->_account->sent_folder); - // sleep for 2 secs because mailserver may be slower than expected - sleep(2); - - $result = $this->_getMessages($folderName); - $message = $this->_getMessageFromSearchResult($result, $messageToSend['subject']); - + $i = 0; + while ($i < 5) { + $result = $this->_getMessages($folderName); + $message = $this->_getMessageFromSearchResult($result, $messageToSend['subject']); + if (! empty($message)) { + break; + } + // sleep for 1 sec because mailserver may be slower than expected + sleep(1); + $i++; + } + $this->assertTrue(! empty($message), 'Sent message not found.'); return $message; -- 2.7.4