Clear redis locks after each test

Author: willemstuursma

tests/mutex/PHPRedisMutexTest.php

@@ -47,10 +47,17 @@ protected function setUp()
         } else {
             $this->redis->connect($uri["host"]);
         }
-        
+
         $this->mutex = new PHPRedisMutex([$this->redis], "test");
     }
 
+    protected function tearDown()
+    {
+        $this->redis->flushAll();
+
+        parent::tearDown();
+    }
+
     /**
      * Tests add() fails.
      *

tests/mutex/PredisMutexTest.php

@@ -3,6 +3,7 @@
 namespace malkusch\lock\mutex;
 
 use Predis\Client;
+use Predis\ClientInterface;
 
 /**
  * Tests for PredisMutex.
@@ -18,14 +19,27 @@
  */
 class PredisMutexTest extends \PHPUnit_Framework_TestCase
 {
-    
+    /**
+     * @var ClientInterface
+     */
+    protected $client;
+
     protected function setUp()
     {
         parent::setUp();
 
         if (!getenv("REDIS_URIS")) {
              $this->markTestSkipped();
         }
+
+        $this->client = new Client("redis://example.net");
+    }
+
+    protected function tearDown()
+    {
+        $this->client->flushall();
+
+        parent::tearDown();
     }
 
     /**
@@ -37,8 +51,7 @@ protected function setUp()
      */
     public function testAddFails()
     {
-        $client = new Client("redis://example.net");
-        $mutex  = new PredisMutex([$client], "test");
+        $mutex  = new PredisMutex([$this->client], "test");
 
         $mutex->synchronized(function () {
             $this->fail("Code execution is not expected");

tests/mutex/RedisMutexTest.php

@@ -42,7 +42,7 @@ protected function setUp()
      * @param int $count The amount of redis apis.
      * @param int $timeout The timeout.
      *
-     * @return \PHPUnit_Framework_MockObject_MockObject The mock.
+     * @return \PHPUnit_Framework_MockObject_MockObject|RedisMutex
      */
     private function buildRedisMutex($count, $timeout = 1)
     {