Ensure that a redis connection is available before interacting with r…

…edis (#15930) See #15929
laravel · Oct 15, 2016 · 5ab5179 · 5ab5179
1 parent 4683c79
commit 5ab5179
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 64 deletions.
diff --git a/composer.json b/composer.json
@@ -89,6 +89,11 @@
             "Illuminate\\": "src/Illuminate/"
         }
     },
+    "autoload-dev": {
+        "files": [
+            "tests/Redis/InteractsWithRedis.php"
+        ]
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "5.4-dev"

diff --git a/tests/Cache/RedisCacheIntegrationTest.php b/tests/Cache/RedisCacheIntegrationTest.php
@@ -2,41 +2,23 @@
 
 use Illuminate\Cache\RedisStore;
 use Illuminate\Cache\Repository;
-use Illuminate\Redis\PredisDatabase;
 use Mockery as m;
 
 class RedisCacheTest extends PHPUnit_Framework_TestCase
 {
-    /**
-     * @var PredisDatabase
-     */
-    private $redis;
+    use InteractsWithRedis;
 
     public function setUp()
     {
         parent::setUp();
-
-        $host = getenv('REDIS_HOST') ?: '127.0.0.1';
-        $port = getenv('REDIS_PORT') ?: 6379;
-
-        $this->redis = new PredisDatabase([
-            'cluster' => false,
-            'default' => [
-                'host' => $host,
-                'port' => $port,
-                'database' => 5,
-                'timeout' => 0.5,
-            ],
-        ]);
-
-        $this->redis->connection()->flushdb();
+        $this->setUpRedis();
     }
 
     public function tearDown()
     {
         parent::tearDown();
         m::close();
-        $this->redis->connection()->flushdb();
+        $this->tearDownRedis();
     }
 
     public function testRedisCacheAddTwice()

diff --git a/tests/Queue/RedisQueueIntegrationTest.php b/tests/Queue/RedisQueueIntegrationTest.php
@@ -4,19 +4,10 @@
 use Illuminate\Queue\RedisQueue;
 use Illuminate\Container\Container;
 use Illuminate\Queue\Jobs\RedisJob;
-use Illuminate\Redis\PredisDatabase;
 
 class RedisQueueIntegrationTest extends PHPUnit_Framework_TestCase
 {
-    /**
-     * @var bool
-     */
-    private static $connectionFailedOnceWithDefaultsSkip = false;
-
-    /**
-     * @var Database
-     */
-    private $redis;
+    use InteractsWithRedis;
 
     /**
      * @var RedisQueue
@@ -26,36 +17,7 @@ class RedisQueueIntegrationTest extends PHPUnit_Framework_TestCase
     public function setUp()
     {
         parent::setUp();
-
-        $host = getenv('REDIS_HOST') ?: '127.0.0.1';
-        $port = getenv('REDIS_PORT') ?: 6379;
-
-        if (static::$connectionFailedOnceWithDefaultsSkip) {
-            $this->markTestSkipped('Trying default host/port failed, please set environment variable REDIS_HOST & REDIS_PORT to enable '.__CLASS__);
-
-            return;
-        }
-
-        $this->redis = new PredisDatabase([
-            'cluster' => false,
-            'default' => [
-                'host' => $host,
-                'port' => $port,
-                'database' => 5,
-                'timeout' => 0.5,
-            ],
-        ]);
-
-        try {
-            $this->redis->connection()->flushdb();
-        } catch (\Exception $e) {
-            if ($host === '127.0.0.1' && $port === 6379 && getenv('REDIS_HOST') === false) {
-                $this->markTestSkipped('Trying default host/port failed, please set environment variable REDIS_HOST & REDIS_PORT to enable '.__CLASS__);
-                static::$connectionFailedOnceWithDefaultsSkip = true;
-
-                return;
-            }
-        }
+        $this->setUpRedis();
 
         $this->queue = new RedisQueue($this->redis);
         $this->queue->setContainer(m::mock(Container::class));
@@ -64,10 +26,8 @@ public function setUp()
     public function tearDown()
     {
         parent::tearDown();
+        $this->tearDownRedis();
         m::close();
-        if ($this->redis) {
-            $this->redis->connection()->flushdb();
-        }
     }
 
     public function testExpiredJobsArePopped()

diff --git a/tests/Redis/InteractsWithRedis.php b/tests/Redis/InteractsWithRedis.php
@@ -0,0 +1,57 @@
+<?php
+
+
+use Illuminate\Redis\PredisDatabase;
+
+trait InteractsWithRedis
+{
+    /**
+     * @var bool
+     */
+    private static $connectionFailedOnceWithDefaultsSkip = false;
+
+    /**
+     * @var PredisDatabase
+     */
+    private $redis;
+
+    public function setUpRedis()
+    {
+        $host = getenv('REDIS_HOST') ?: '127.0.0.1';
+        $port = getenv('REDIS_PORT') ?: 6379;
+
+        if (static::$connectionFailedOnceWithDefaultsSkip) {
+            $this->markTestSkipped('Trying default host/port failed, please set environment variable REDIS_HOST & REDIS_PORT to enable '.__CLASS__);
+
+            return;
+        }
+
+        $this->redis = new PredisDatabase([
+            'cluster' => false,
+            'default' => [
+                'host' => $host,
+                'port' => $port,
+                'database' => 5,
+                'timeout' => 0.5,
+            ],
+        ]);
+
+        try {
+            $this->redis->connection()->flushdb();
+        } catch (\Exception $e) {
+            if ($host === '127.0.0.1' && $port === 6379 && getenv('REDIS_HOST') === false) {
+                $this->markTestSkipped('Trying default host/port failed, please set environment variable REDIS_HOST & REDIS_PORT to enable '.__CLASS__);
+                static::$connectionFailedOnceWithDefaultsSkip = true;
+
+                return;
+            }
+        }
+    }
+
+    public function tearDownRedis()
+    {
+        if ($this->redis) {
+            $this->redis->connection()->flushdb();
+        }
+    }
+}