Merge branch '2015.11' into 2016.11

diff --git a/tests/tine20/Felamimail/Frontend/JsonTest.php b/tests/tine20/Felamimail/Frontend/JsonTest.php
index 6861390..fe6e391 100644 (file)
--- a/tests/tine20/Felamimail/Frontend/JsonTest.php
+++ b/tests/tine20/Felamimail/Frontend/JsonTest.php
@@ -933,6 +933,9 @@ class Felamimail_Frontend_JsonTest extends TestCase
             'field' => 'id', 'operator' => 'in', 'value' => array($message['id'])
         )), $testFolder->getId());
 
+        // sleep for 2 secs because mailserver may be slower than expected
+        sleep(2);
+
         $inboxAfter = $this->_getFolder('INBOX');
         
         // check if count was decreased correctly