[FrameworkBundle] Skip redis cache pools test on failed connection

chalasr · chalasr · commit 304fca61edca · 2016-06-01T19:41:53.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());
         }
     }
 
@@ -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());
         }
     }
 

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`
`@@ -48,6 +54,11 @@ public function testRedisCustomCachePools()`
`48`	`54`	`throw $e;`
`49`	`55`	`}`
`50`	`56`	`$this->markTestSkipped($e->getMessage());`
	`57`	`+ } catch (InvalidArgumentException $e) {`
	`58`	`+ if (0 !== strpos($e->getMessage(), 'Redis connection failed')) {`
	`59`	`+ throw $e;`
	`60`	`+ }`
	`61`	`+ $this->markTestSkipped($e->getMessage());`
`51`	`62`	`}`
`52`	`63`	`}`
`53`	`64`