[FrameworkBundle] Skip redis cache pools test on failed connection

chalasr · fabpot · commit 0d349dd496e8 · 2016-06-03T07:29:16.000+02:00
diff --git 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());
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`
`14`	`14`	`use Symfony\Component\Cache\Adapter\FilesystemAdapter;`
`15`	`15`	`use Symfony\Component\Cache\Adapter\RedisAdapter;`
	`16`	`+use Symfony\Component\Cache\Exception\InvalidArgumentException;`
`16`	`17`
`17`	`18`	`class CachePoolsTest extends WebTestCase`
`18`	`19`	`{`
`@@ -33,6 +34,11 @@ public function testRedisCachePools()`
`33`	`34`	`throw $e;`
`34`	`35`	`}`
`35`	`36`	`$this->markTestSkipped($e->getMessage());`
	`37`	`+ } catch (InvalidArgumentException $e) {`
	`38`	`+ if (0 !== strpos($e->getMessage(), 'Redis connection failed')) {`
	`39`	`+ throw $e;`
	`40`	`+ }`
	`41`	`+ $this->markTestSkipped($e->getMessage());`
`36`	`42`	`}`
`37`	`43`	`}`
`38`	`44`