Skip to content

Commit 6c6c679

Browse files
committed
Merge branch '5.1' into 5.2
* 5.1: do not depend on the actual time to fix a transient test Run Redis Sentinel tests in GithubAction Minor : Removed typo (extra "the" term) Check if method inheritEnvironmentVariables exists [PhpUnitBridge] Fix test fixture file name
2 parents f3c0a00 + 2862706 commit 6c6c679

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

Tests/HttpCache/ResponseCacheStrategyTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ public function testResponseIsExpirableButNotValidateableWhenMasterResponseCombi
239239
}
240240

241241
/**
242+
* @group time-sensitive
242243
* @dataProvider cacheControlMergingProvider
243244
*/
244245
public function testCacheControlMerging(array $expects, array $master, array $surrogates)

0 commit comments

Comments
 (0)