[FrameworkBundle] Fix tests

nicolas-grekas · nicolas-grekas · commit af1b2cc11a5d · 2021-09-27T10:21:39.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php
@@ -27,18 +27,15 @@ public function testCachePools()
      */
     public function testRedisCachePools()
     {
+        $this->skipIfRedisUnavailable();
+
         try {
             $this->doTestCachePools(['root_config' => 'redis_config.yml', 'environment' => 'redis_cache'], RedisAdapter::class);
         } catch (\PHPUnit\Framework\Error\Warning $e) {
             if (0 !== strpos($e->getMessage(), 'unable to connect to')) {
                 throw $e;
             }
             $this->markTestSkipped($e->getMessage());
-        } catch (\PHPUnit\Framework\Error\Warning $e) {
-            if (0 !== strpos($e->getMessage(), 'unable to connect to')) {
-                throw $e;
-            }
-            $this->markTestSkipped($e->getMessage());
         } catch (InvalidArgumentException $e) {
             if (0 !== strpos($e->getMessage(), 'Redis connection ')) {
                 throw $e;
@@ -52,18 +49,15 @@ public function testRedisCachePools()
      */
     public function testRedisCustomCachePools()
     {
+        $this->skipIfRedisUnavailable();
+
         try {
             $this->doTestCachePools(['root_config' => 'redis_custom_config.yml', 'environment' => 'custom_redis_cache'], RedisAdapter::class);
         } catch (\PHPUnit\Framework\Error\Warning $e) {
             if (0 !== strpos($e->getMessage(), 'unable to connect to')) {
                 throw $e;
             }
             $this->markTestSkipped($e->getMessage());
-        } catch (\PHPUnit\Framework\Error\Warning $e) {
-            if (0 !== strpos($e->getMessage(), 'unable to connect to')) {
-                throw $e;
-            }
-            $this->markTestSkipped($e->getMessage());
         }
     }
 
@@ -100,4 +94,13 @@ protected static function createKernel(array $options = [])
     {
         return parent::createKernel(['test_case' => 'CachePools'] + $options);
     }
+
+    private function skipIfRedisUnavailable()
+    {
+        try {
+            (new \Redis())->connect(getenv('REDIS_HOST'));
+        } catch (\Exception $e) {
+            self::markTestSkipped($e->getMessage());
+        }
+    }
 }
