minor #23958 [Lock] Fix race condition in tests between cache and lock component (jderusse)

nicolas-grekas · nicolas-grekas · commit c4ecb9c75d1a · 2017-09-03T16:06:51.000+02:00
This PR was submitted for the 3.4 branch but it was merged into the 3.3 branch instead (closes #23958). Discussion ---------- [Lock] Fix race condition in tests between cache and lock component | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Currently trying to fix * [x] php 5.5 in testSaveWithDifferentResources "Failed asserting that false is true" * [x] php 5.5 in testSaveWithDifferentKeysOnSameResources "The store shouldn't save the second key" Workflow: * [x] find a reproducer * [x] fix memcached tests => #23969 * [x] fix redis tests => this PR Commits ------- 26948cf Fix race condition in tests between cache and lock
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php
@@ -41,7 +41,6 @@ public static function setupBeforeClass()
 
     public static function tearDownAfterClass()
     {
-        self::$redis->flushDB();
         self::$redis = null;
     }
 }
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PredisClusterAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PredisClusterAdapterTest.php
@@ -21,7 +21,6 @@ public static function setupBeforeClass()
 
     public static function tearDownAfterClass()
     {
-        self::$redis->getConnection()->getConnectionByKey('foo')->executeCommand(self::$redis->createCommand('FLUSHDB'));
         self::$redis = null;
     }
 }
diff --git a/src/Symfony/Component/Cache/Tests/Simple/AbstractRedisCacheTest.php b/src/Symfony/Component/Cache/Tests/Simple/AbstractRedisCacheTest.php
@@ -41,7 +41,6 @@ public static function setupBeforeClass()
 
     public static function tearDownAfterClass()
     {
-        self::$redis->flushDB();
         self::$redis = null;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@ public static function setupBeforeClass()`
`41`	`41`
`42`	`42`	`public static function tearDownAfterClass()`
`43`	`43`	`{`
`44`		`- self::$redis->flushDB();`
`45`	`44`	`self::$redis = null;`
`46`	`45`	`}`
`47`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ public static function setupBeforeClass()`
`21`	`21`
`22`	`22`	`public static function tearDownAfterClass()`
`23`	`23`	`{`
`24`		`- self::$redis->getConnection()->getConnectionByKey('foo')->executeCommand(self::$redis->createCommand('FLUSHDB'));`
`25`	`24`	`self::$redis = null;`
`26`	`25`	`}`
`27`	`26`	`}`