Update Redis tests

Author: willemstuursma

tests/mutex/PHPRedisMutexTest.php

@@ -3,6 +3,7 @@
 namespace malkusch\lock\mutex;
 
 use Redis;
+use RedisException;
 
 /**
  * Tests for PHPRedisMutex.
@@ -16,10 +17,10 @@
  * @license WTFPL
  * @see PHPRedisMutex
  * @requires redis
+ * @group redis
  */
 class PHPRedisMutexTest extends \PHPUnit_Framework_TestCase
 {
-    
     /**
      * @var Redis The Redis API.
      */
@@ -34,28 +35,19 @@ protected function setUp()
     {
         parent::setUp();
 
-        if (!getenv("REDIS_URIS")) {
-             $this->markTestSkipped();
-             return;
-        }
         $this->redis = new Redis();
 
-        $uris = explode(",", getenv("REDIS_URIS"));
+        $uris = explode(",", getenv("REDIS_URIS") ?: "redis://localhost");
         $uri  = parse_url($uris[0]);
         if (!empty($uri["port"])) {
             $this->redis->connect($uri["host"], $uri["port"]);
         } else {
             $this->redis->connect($uri["host"]);
         }
 
-        $this->mutex = new PHPRedisMutex([$this->redis], "test");
-    }
+        $this->redis->flushAll(); // Clear any existing locks.
 
-    protected function tearDown()
-    {
-        $this->redis->flushAll();
-
-        parent::tearDown();
+        $this->mutex = new PHPRedisMutex([$this->redis], "test");
     }
 
     /**

tests/mutex/PredisMutexTest.php

@@ -16,6 +16,7 @@
  * @link bitcoin:1335STSwu9hST4vcMRppEPgENMHD2r1REK Donations
  * @license WTFPL
  * @see PredisMutex
+ * @group redis
  */
 class PredisMutexTest extends \PHPUnit_Framework_TestCase
 {
@@ -28,18 +29,8 @@ 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();
+        $this->client = new Client(getenv("REDIS_URIS") ?: "redis://localhost");
+        $this->client->flushall(); // Clear any existing locks
     }
 
     /**
@@ -51,7 +42,9 @@ protected function tearDown()
      */
     public function testAddFails()
     {
-        $mutex  = new PredisMutex([$this->client], "test");
+        $client = new Client("redis://127.0.0.1:12345");
+
+        $mutex  = new PredisMutex([$client], "test");
 
         $mutex->synchronized(function () {
             $this->fail("Code execution is not expected");

tests/mutex/RedisMutexTest.php

@@ -17,6 +17,7 @@
  * @license WTFPL
  *
  * @see RedisMutex
+ * @group redis
  */
 class RedisMutexTest extends \PHPUnit_Framework_TestCase
 {