[5.4] Test predis and phpredis together (#17882)

* test predis and phpredis together * fix phpdoc
laravel · Feb 13, 2017 · be9bc6d · be9bc6d
1 parent 9b7a008
commit be9bc6d
Show file tree

Hide file tree

Showing 5 changed files with 148 additions and 53 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -30,6 +30,7 @@ services:
 before_install:
   - if [[ $TRAVIS_PHP_VERSION != 7.1 ]] ; then phpenv config-rm xdebug.ini; fi
   - echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+  - echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
   - travis_retry composer self-update
 
 install:

diff --git a/src/Illuminate/Queue/RedisQueue.php b/src/Illuminate/Queue/RedisQueue.php
@@ -212,7 +212,7 @@ protected function retrieveNextJob($queue)
      * Delete a reserved job from the queue.
      *
      * @param  string  $queue
-     * @param  \Illuminate\Queues\Jobs\RedisJob  $job
+     * @param  \Illuminate\Queue\Jobs\RedisJob  $job
      * @return void
      */
     public function deleteReserved($queue, $job)
@@ -224,7 +224,7 @@ public function deleteReserved($queue, $job)
      * Delete a reserved job from the reserved queue and release it.
      *
      * @param  string  $queue
-     * @param  \Illuminate\Queues\Jobs\RedisJob  $job
+     * @param  \Illuminate\Queue\Jobs\RedisJob  $job
      * @param  int  $delay
      * @return void
      */

diff --git a/tests/Cache/RedisCacheIntegrationTest.php b/tests/Cache/RedisCacheIntegrationTest.php
@@ -25,31 +25,46 @@ public function tearDown()
         $this->tearDownRedis();
     }
 
-    public function testRedisCacheAddTwice()
+    /**
+     * @dataProvider redisDriverProvider
+     *
+     * @param string $driver
+     */
+    public function testRedisCacheAddTwice($driver)
     {
-        $store = new RedisStore($this->redis);
+        $store = new RedisStore($this->redis[$driver]);
         $repository = new Repository($store);
         $this->assertTrue($repository->add('k', 'v', 60));
         $this->assertFalse($repository->add('k', 'v', 60));
+        $this->assertGreaterThan(3500, $this->redis[$driver]->connection()->ttl('k'));
     }
 
     /**
      * Breaking change.
+     *
+     * @dataProvider redisDriverProvider
+     *
+     * @param string $driver
      */
-    public function testRedisCacheAddFalse()
+    public function testRedisCacheAddFalse($driver)
     {
-        $store = new RedisStore($this->redis);
+        $store = new RedisStore($this->redis[$driver]);
         $repository = new Repository($store);
         $repository->forever('k', false);
         $this->assertFalse($repository->add('k', 'v', 60));
+        $this->assertEquals(-1, $this->redis[$driver]->connection()->ttl('k'));
     }
 
     /**
      * Breaking change.
+     *
+     * @dataProvider redisDriverProvider
+     *
+     * @param string $driver
      */
-    public function testRedisCacheAddNull()
+    public function testRedisCacheAddNull($driver)
     {
-        $store = new RedisStore($this->redis);
+        $store = new RedisStore($this->redis[$driver]);
         $repository = new Repository($store);
         $repository->forever('k', null);
         $this->assertFalse($repository->add('k', 'v', 60));

diff --git a/tests/Queue/RedisQueueIntegrationTest.php b/tests/Queue/RedisQueueIntegrationTest.php
@@ -24,9 +24,6 @@ public function setUp()
         Carbon::setTestNow();
         parent::setUp();
         $this->setUpRedis();
-
-        $this->queue = new RedisQueue($this->redis);
-        $this->queue->setContainer(m::mock(Container::class));
     }
 
     public function tearDown()
@@ -37,8 +34,15 @@ public function tearDown()
         m::close();
     }
 
-    public function testExpiredJobsArePopped()
+    /**
+     * @dataProvider redisDriverProvider
+     *
+     * @param string $driver
+     */
+    public function testExpiredJobsArePopped($driver)
     {
+        $this->setQueue($driver);
+
         $jobs = [
             new RedisQueueIntegrationTestJob(0),
             new RedisQueueIntegrationTestJob(1),
@@ -56,12 +60,19 @@ public function testExpiredJobsArePopped()
         $this->assertEquals($jobs[3], unserialize(json_decode($this->queue->pop()->getRawBody())->data->command));
         $this->assertNull($this->queue->pop());
 
-        $this->assertEquals(1, $this->redis->connection()->zcard('queues:default:delayed'));
-        $this->assertEquals(3, $this->redis->connection()->zcard('queues:default:reserved'));
+        $this->assertEquals(1, $this->redis[$driver]->connection()->zcard('queues:default:delayed'));
+        $this->assertEquals(3, $this->redis[$driver]->connection()->zcard('queues:default:reserved'));
     }
 
-    public function testPopProperlyPopsJobOffOfRedis()
+    /**
+     * @dataProvider redisDriverProvider
+     *
+     * @param string $driver
+     */
+    public function testPopProperlyPopsJobOffOfRedis($driver)
     {
+        $this->setQueue($driver);
+
         // Push an item into queue
         $job = new RedisQueueIntegrationTestJob(10);
         $this->queue->push($job);
@@ -79,17 +90,23 @@ public function testPopProperlyPopsJobOffOfRedis()
         $this->assertEquals($redisJob->getJobId(), json_decode($redisJob->getReservedJob())->id);
 
         // Check reserved queue
-        $this->assertEquals(1, $this->redis->connection()->zcard('queues:default:reserved'));
-        $result = $this->redis->connection()->zrangebyscore('queues:default:reserved', -INF, INF, ['WITHSCORES' => true]);
+        $this->assertEquals(1, $this->redis[$driver]->connection()->zcard('queues:default:reserved'));
+        $result = $this->redis[$driver]->connection()->zrangebyscore('queues:default:reserved', -INF, INF, ['withscores' => true]);
         $reservedJob = array_keys($result)[0];
         $score = $result[$reservedJob];
         $this->assertLessThanOrEqual($score, $before + 60);
         $this->assertGreaterThanOrEqual($score, $after + 60);
         $this->assertEquals($job, unserialize(json_decode($reservedJob)->data->command));
     }
 
-    public function testPopProperlyPopsDelayedJobOffOfRedis()
+    /**
+     * @dataProvider redisDriverProvider
+     *
+     * @param string $driver
+     */
+    public function testPopProperlyPopsDelayedJobOffOfRedis($driver)
     {
+        $this->setQueue($driver);
         // Push an item into queue
         $job = new RedisQueueIntegrationTestJob(10);
         $this->queue->later(-10, $job);
@@ -100,18 +117,23 @@ public function testPopProperlyPopsDelayedJobOffOfRedis()
         $after = time();
 
         // Check reserved queue
-        $this->assertEquals(1, $this->redis->connection()->zcard('queues:default:reserved'));
-        $result = $this->redis->connection()->zrangebyscore('queues:default:reserved', -INF, INF, ['WITHSCORES' => true]);
+        $this->assertEquals(1, $this->redis[$driver]->connection()->zcard('queues:default:reserved'));
+        $result = $this->redis[$driver]->connection()->zrangebyscore('queues:default:reserved', -INF, INF, ['withscores' => true]);
         $reservedJob = array_keys($result)[0];
         $score = $result[$reservedJob];
         $this->assertLessThanOrEqual($score, $before + 60);
         $this->assertGreaterThanOrEqual($score, $after + 60);
         $this->assertEquals($job, unserialize(json_decode($reservedJob)->data->command));
     }
 
-    public function testPopPopsDelayedJobOffOfRedisWhenExpireNull()
+    /**
+     * @dataProvider redisDriverProvider
+     *
+     * @param string $driver
+     */
+    public function testPopPopsDelayedJobOffOfRedisWhenExpireNull($driver)
     {
-        $this->queue = new RedisQueue($this->redis, 'default', null, null);
+        $this->queue = new RedisQueue($this->redis[$driver], 'default', null, null);
         $this->queue->setContainer(m::mock(Container::class));
 
         // Push an item into queue
@@ -124,18 +146,23 @@ public function testPopPopsDelayedJobOffOfRedisWhenExpireNull()
         $after = time();
 
         // Check reserved queue
-        $this->assertEquals(1, $this->redis->connection()->zcard('queues:default:reserved'));
-        $result = $this->redis->connection()->zrangebyscore('queues:default:reserved', -INF, INF, ['WITHSCORES' => true]);
+        $this->assertEquals(1, $this->redis[$driver]->connection()->zcard('queues:default:reserved'));
+        $result = $this->redis[$driver]->connection()->zrangebyscore('queues:default:reserved', -INF, INF, ['withscores' => true]);
         $reservedJob = array_keys($result)[0];
         $score = $result[$reservedJob];
         $this->assertLessThanOrEqual($score, $before);
         $this->assertGreaterThanOrEqual($score, $after);
         $this->assertEquals($job, unserialize(json_decode($reservedJob)->data->command));
     }
 
-    public function testNotExpireJobsWhenExpireNull()
+    /**
+     * @dataProvider redisDriverProvider
+     *
+     * @param string $driver
+     */
+    public function testNotExpireJobsWhenExpireNull($driver)
     {
-        $this->queue = new RedisQueue($this->redis, 'default', null, null);
+        $this->queue = new RedisQueue($this->redis[$driver], 'default', null, null);
         $this->queue->setContainer(m::mock(Container::class));
 
         // Make an expired reserved job
@@ -155,8 +182,8 @@ public function testNotExpireJobsWhenExpireNull()
         $after = time();
 
         // Check reserved queue
-        $this->assertEquals(2, $this->redis->connection()->zcard('queues:default:reserved'));
-        $result = $this->redis->connection()->zrangebyscore('queues:default:reserved', -INF, INF, ['WITHSCORES' => true]);
+        $this->assertEquals(2, $this->redis[$driver]->connection()->zcard('queues:default:reserved'));
+        $result = $this->redis[$driver]->connection()->zrangebyscore('queues:default:reserved', -INF, INF, ['withscores' => true]);
 
         foreach ($result as $payload => $score) {
             $command = unserialize(json_decode($payload)->data->command);
@@ -172,9 +199,14 @@ public function testNotExpireJobsWhenExpireNull()
         }
     }
 
-    public function testExpireJobsWhenExpireSet()
+    /**
+     * @dataProvider redisDriverProvider
+     *
+     * @param string $driver
+     */
+    public function testExpireJobsWhenExpireSet($driver)
     {
-        $this->queue = new RedisQueue($this->redis, 'default', null, 30);
+        $this->queue = new RedisQueue($this->redis[$driver], 'default', null, 30);
         $this->queue->setContainer(m::mock(Container::class));
 
         // Push an item into queue
@@ -187,17 +219,24 @@ public function testExpireJobsWhenExpireSet()
         $after = time();
 
         // Check reserved queue
-        $this->assertEquals(1, $this->redis->connection()->zcard('queues:default:reserved'));
-        $result = $this->redis->connection()->zrangebyscore('queues:default:reserved', -INF, INF, ['WITHSCORES' => true]);
+        $this->assertEquals(1, $this->redis[$driver]->connection()->zcard('queues:default:reserved'));
+        $result = $this->redis[$driver]->connection()->zrangebyscore('queues:default:reserved', -INF, INF, ['withscores' => true]);
         $reservedJob = array_keys($result)[0];
         $score = $result[$reservedJob];
         $this->assertLessThanOrEqual($score, $before + 30);
         $this->assertGreaterThanOrEqual($score, $after + 30);
         $this->assertEquals($job, unserialize(json_decode($reservedJob)->data->command));
     }
 
-    public function testRelease()
+    /**
+     * @dataProvider redisDriverProvider
+     *
+     * @param string $driver
+     */
+    public function testRelease($driver)
     {
+        $this->setQueue($driver);
+
         //push a job into queue
         $job = new RedisQueueIntegrationTestJob(30);
         $this->queue->push($job);
@@ -210,9 +249,9 @@ public function testRelease()
         $after = time();
 
         //check the content of delayed queue
-        $this->assertEquals(1, $this->redis->connection()->zcard('queues:default:delayed'));
+        $this->assertEquals(1, $this->redis[$driver]->connection()->zcard('queues:default:delayed'));
 
-        $results = $this->redis->connection()->zrangebyscore('queues:default:delayed', -INF, INF, ['WITHSCORES' => true]);
+        $results = $this->redis[$driver]->connection()->zrangebyscore('queues:default:delayed', -INF, INF, ['withscores' => true]);
 
         $payload = array_keys($results)[0];
 
@@ -230,8 +269,14 @@ public function testRelease()
         $this->assertNull($this->queue->pop());
     }
 
-    public function testReleaseInThePast()
+    /**
+     * @dataProvider redisDriverProvider
+     *
+     * @param string $driver
+     */
+    public function testReleaseInThePast($driver)
     {
+        $this->setQueue($driver);
         $job = new RedisQueueIntegrationTestJob(30);
         $this->queue->push($job);
 
@@ -242,8 +287,15 @@ public function testReleaseInThePast()
         $this->assertInstanceOf(RedisJob::class, $this->queue->pop());
     }
 
-    public function testDelete()
+    /**
+     * @dataProvider redisDriverProvider
+     *
+     * @param string $driver
+     */
+    public function testDelete($driver)
     {
+        $this->setQueue($driver);
+
         $job = new RedisQueueIntegrationTestJob(30);
         $this->queue->push($job);
 
@@ -252,15 +304,21 @@ public function testDelete()
 
         $redisJob->delete();
 
-        $this->assertEquals(0, $this->redis->connection()->zcard('queues:default:delayed'));
-        $this->assertEquals(0, $this->redis->connection()->zcard('queues:default:reserved'));
-        $this->assertEquals(0, $this->redis->connection()->llen('queues:default'));
+        $this->assertEquals(0, $this->redis[$driver]->connection()->zcard('queues:default:delayed'));
+        $this->assertEquals(0, $this->redis[$driver]->connection()->zcard('queues:default:reserved'));
+        $this->assertEquals(0, $this->redis[$driver]->connection()->llen('queues:default'));
 
         $this->assertNull($this->queue->pop());
     }
 
-    public function testSize()
+    /**
+     * @dataProvider redisDriverProvider
+     *
+     * @param string $driver
+     */
+    public function testSize($driver)
     {
+        $this->setQueue($driver);
         $this->assertEquals(0, $this->queue->size());
         $this->queue->push(new RedisQueueIntegrationTestJob(1));
         $this->assertEquals(1, $this->queue->size());
@@ -273,6 +331,15 @@ public function testSize()
         $job->delete();
         $this->assertEquals(2, $this->queue->size());
     }
+
+    /**
+     * @param string $driver
+     */
+    private function setQueue($driver)
+    {
+        $this->queue = new RedisQueue($this->redis[$driver]);
+        $this->queue->setContainer(m::mock(Container::class));
+    }
 }
 
 class RedisQueueIntegrationTestJob