From 304fca61edcaf4549878011b4e9027879a8a850a Mon Sep 17 00:00:00 2001
From: Robin Chalas <robin.chalas@gmail.com>
Date: Wed, 1 Jun 2016 19:27:22 +0200
Subject: [PATCH 1/2] [FrameworkBundle] Skip redis cache pools test on failed
 connection

---
 .../Tests/Functional/CachePoolsTest.php               | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php
index 5724a0afccb95..88000da1724de 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Component\Cache\Adapter\RedisAdapter;
+use Symfony\Component\Cache\Exception\InvalidArgumentException;
 
 class CachePoolsTest extends WebTestCase
 {
@@ -33,6 +34,11 @@ public function testRedisCachePools()
                 throw $e;
             }
             $this->markTestSkipped($e->getMessage());
+        } catch (InvalidArgumentException $e) {
+            if (0 !== strpos($e->getMessage(), 'Redis connection failed')) {
+                throw $e;
+            }
+            $this->markTestSkipped($e->getMessage());
         }
     }
 
@@ -48,6 +54,11 @@ public function testRedisCustomCachePools()
                 throw $e;
             }
             $this->markTestSkipped($e->getMessage());
+        } catch (InvalidArgumentException $e) {
+            if (0 !== strpos($e->getMessage(), 'Redis connection failed')) {
+                throw $e;
+            }
+            $this->markTestSkipped($e->getMessage());
         }
     }
 

From afa4c624be1a455650ca85b2e98ed4418cca3812 Mon Sep 17 00:00:00 2001
From: Robin Chalas <robin.chalas@gmail.com>
Date: Thu, 2 Jun 2016 10:43:05 +0200
Subject: [PATCH 2/2] Remove useless catch on RedisCustomCachePools

---
 .../FrameworkBundle/Tests/Functional/CachePoolsTest.php      | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php
index 88000da1724de..565354343e2d7 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php
@@ -54,11 +54,6 @@ public function testRedisCustomCachePools()
                 throw $e;
             }
             $this->markTestSkipped($e->getMessage());
-        } catch (InvalidArgumentException $e) {
-            if (0 !== strpos($e->getMessage(), 'Redis connection failed')) {
-                throw $e;
-            }
-            $this->markTestSkipped($e->getMessage());
         }
     }