minor #18432 [Cache] Fix tests (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 85506a0cbe17 · 2016-04-04T11:31:10.000+02:00
This PR was merged into the 3.1-dev branch. Discussion ---------- [Cache] Fix tests | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- 41f3f82 [Cache] Fix tests
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/ChainAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/ChainAdapterTest.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\Cache\Tests\Adapter;
 
 use Cache\IntegrationTests\CachePoolTest;
-use Symfony\Component\Cache\Adapter\ApcuAdapter;
+use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\Cache\Adapter\ChainAdapter;
 use Symfony\Component\Cache\Tests\Fixtures\ExternalAdapter;
@@ -27,11 +27,8 @@ public function createCachePool()
         if (defined('HHVM_VERSION')) {
             $this->skippedTests['testDeferredSaveWithoutCommit'] = 'Fails on HHVM';
         }
-        if (!function_exists('apcu_fetch') || !ini_get('apc.enabled') || ('cli' === PHP_SAPI && !ini_get('apc.enable_cli'))) {
-            $this->markTestSkipped('APCu extension is required.');
-        }
 
-        return new ChainAdapter(array(new ArrayAdapter(), new ExternalAdapter(), new ApcuAdapter()));
+        return new ChainAdapter(array(new ArrayAdapter(), new ExternalAdapter(), new FilesystemAdapter(null)));
     }
 
     /**
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterTest.php
@@ -33,7 +33,10 @@ public function createCachePool()
     public static function setupBeforeClass()
     {
         self::$redis = new \Redis();
-        self::$redis->connect('127.0.0.1');
+        if (!@self::$redis->connect('127.0.0.1')) {
+            $e = error_get_last();
+            self::markTestSkipped($e['message']);
+        }
         self::$redis->select(1993);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,10 @@ public function createCachePool()`
`33`	`33`	`public static function setupBeforeClass()`
`34`	`34`	`{`
`35`	`35`	`self::$redis = new \Redis();`
`36`		`- self::$redis->connect('127.0.0.1');`
	`36`	`+ if (!@self::$redis->connect('127.0.0.1')) {`
	`37`	`+ $e = error_get_last();`
	`38`	`+ self::markTestSkipped($e['message']);`
	`39`	`+ }`
`37`	`40`	`self::$redis->select(1993);`
`38`	`41`	`}`
`39`	`42`