minor #18939 [FrameworkBundle] Skip redis cache pools test on failed connection (chalasr)

fabpot · fabpot · commit eced97bf51a9 · 2016-06-03T07:29:17.000+02:00
This PR was squashed before being merged into the 3.1 branch (closes #18939). Discussion ---------- [FrameworkBundle] Skip redis cache pools test on failed connection | Q | A | ------------- | --- | Branch? | 3.1 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Actually, running the FrameworkBundle tests suit leads to a failure that says: > 1) Symfony\Bundle\FrameworkBundle\Tests\Functional\CachePoolsTest::testRedisCachePools Symfony\Component\Cache\Exception\InvalidArgumentException: Redis connection failed: redis://localhost [...] [...]/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php:59 [...]/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php:30 So I propose to catch this specific exception in case of redis is not (locally) supported, in order to be sure that tests stay green. Commits ------- 0d349dd [FrameworkBundle] Skip redis cache pools test on failed connection
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`