improve tests skipping

Author: jeffreyzant

.travis.yml

@@ -130,7 +130,6 @@ before_install:
 
 install: travis_retry composer install --prefer-dist --no-interaction --no-suggest
 
-before_script:
-  - SUPERVISE=no travis_retry ./start-cluster.sh || { cat ./cluster/*.log; false; }
+before_script: SUPERVISE=no travis_retry ./start-cluster.sh || { cat ./cluster/*.log; false; }
 
 script: vendor/bin/phpunit --exclude-group ${LUMEN_VERSION:+laravel-only},${HORIZON:-horizon}

tests/Integration/Connections/PhpRedisConnectionTest.php

@@ -29,8 +29,6 @@ public function setUp()
         parent::setUp();
 
         if (! extension_loaded('redis')) {
-            $this->markTestSkipped('The redis extension is not installed. Please install the extension to enable '.__CLASS__);
-
             return;
         }
 
@@ -39,13 +37,25 @@ public function setUp()
 
     public function testAllowsTransactionsOnAggregateConnection()
     {
+        if (! extension_loaded('redis')) {
+            $this->markTestSkipped('The redis extension is not installed. Please install the extension to enable '.__CLASS__);
+
+            return;
+        }
+
         $transaction = $this->subject->transaction();
 
         $this->assertInstanceOf(Redis::class, $transaction);
     }
 
     public function testExecutesCommandsInTransaction()
     {
+        if (! extension_loaded('redis')) {
+            $this->markTestSkipped('The redis extension is not installed. Please install the extension to enable '.__CLASS__);
+
+            return;
+        }
+
         $result = $this->subject->transaction(function ($trans) {
             $trans->set('test-key', 'test value');
             $trans->get('test-key');
@@ -59,6 +69,12 @@ public function testExecutesCommandsInTransaction()
 
     public function testExecutesTransactionsOnMaster()
     {
+        if (! extension_loaded('redis')) {
+            $this->markTestSkipped('The redis extension is not installed. Please install the extension to enable '.__CLASS__);
+
+            return;
+        }
+
         $expectedSubset = ['role' => 'master'];
 
         $info = $this->subject->transaction(function ($transaction) {
@@ -70,6 +86,12 @@ public function testExecutesTransactionsOnMaster()
 
     public function testAbortsTransactionOnException()
     {
+        if (! extension_loaded('redis')) {
+            $this->markTestSkipped('The redis extension is not installed. Please install the extension to enable '.__CLASS__);
+
+            return;
+        }
+
         $exception = null;
 
         try {
@@ -88,6 +110,12 @@ public function testAbortsTransactionOnException()
 
     public function testRetriesTransactionWhenConnectionFails()
     {
+        if (! extension_loaded('redis')) {
+            $this->markTestSkipped('The redis extension is not installed. Please install the extension to enable '.__CLASS__);
+
+            return;
+        }
+
         $this->expectException(RedisRetryException::class);
 
         $this->subject = $this->makeConnection(1, 0); // retry once and immediately
@@ -99,6 +127,12 @@ public function testRetriesTransactionWhenConnectionFails()
 
     public function testCanReconnectWhenConnectionFails()
     {
+        if (! extension_loaded('redis')) {
+            $this->markTestSkipped('The redis extension is not installed. Please install the extension to enable '.__CLASS__);
+
+            return;
+        }
+
         $retries = 3;
         $attempts = 0;