Merge branch 'master' of https://github.com/zendframework/zf2

zendframework · May 29, 2014 · fb5d494 · fb5d494
8 parents 5e48a12 + 02e14e6 + e24be06 + 1cd130f + 2f4d84a + c5055d9 + b5302e2 + 9969a8b
commit fb5d494
Showing 1 changed file with 23 additions and 0 deletions.
diff --git a/test/Storage/Adapter/CommonAdapterTest.php b/test/Storage/Adapter/CommonAdapterTest.php
@@ -225,6 +225,8 @@ public function testHasItemReturnsFalseOnExpiredItem()
         $ttl = $capabilities->getTtlPrecision();
         $this->_options->setTtl($ttl);
 
+        $this->waitForFullSecond();
+
         $this->assertTrue($this->_storage->setItem('key', 'value'));
 
         // wait until the item expired
@@ -300,6 +302,8 @@ public function testGetItemReturnsNullOnExpiredItem()
         $ttl = $capabilities->getTtlPrecision();
         $this->_options->setTtl($ttl);
 
+        $this->waitForFullSecond();
+
         $this->_storage->setItem('key', 'value');
 
         // wait until expired
@@ -543,6 +547,8 @@ public function testSetAndGetExpiredItem()
         $ttl = $capabilities->getTtlPrecision();
         $this->_options->setTtl($ttl);
 
+        $this->waitForFullSecond();
+
         $this->_storage->setItem('key', 'value');
 
         // wait until expired
@@ -581,6 +587,9 @@ public function testSetAndGetExpiredItems()
             'key2' => 'value2',
             'key3' => 'value3'
         );
+
+        $this->waitForFullSecond();
+
         $this->assertSame(array(), $this->_storage->setItems($items));
 
         // wait until expired
@@ -828,6 +837,8 @@ public function testTouchItem()
 
         $this->_options->setTtl(2 * $capabilities->getTtlPrecision());
 
+        $this->waitForFullSecond();
+
         $this->assertTrue($this->_storage->setItem('key', 'value'));
 
         // sleep 1 times before expire to touch the item
@@ -1000,6 +1011,8 @@ public function testClearExpired()
         $ttl = $capabilities->getTtlPrecision();
         $this->_options->setTtl($ttl);
 
+        $this->waitForFullSecond();
+
         $this->assertTrue($this->_storage->setItem('key1', 'value1'));
 
         // wait until the first item expired
@@ -1090,4 +1103,14 @@ public function testGetAvailableSpace()
             $this->assertLessThanOrEqual($totalSpace, $availableSpace);
         }
     }
+
+    /**
+     * This will wait for a full second started
+     * to reduce test failures on high load servers
+     * @see https://github.com/zendframework/zf2/issues/5144
+     */
+    protected function waitForFullSecond()
+    {
+        usleep((microtime(true)-time()) * 1000000);
+    }
 }