Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 728574d

Browse filesBrowse files
committed
minor #39095 [Cache] Run Redis Sentinel tests in GithubAction (jderusse)
This PR was merged into the 4.4 branch. Discussion ---------- [Cache] Run Redis Sentinel tests in GithubAction | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Add support for Sentinel tests in GHA Commits ------- bd84394 Run Redis Sentinel tests in GithubAction
2 parents d6f27fa + bd84394 commit 728574d
Copy full SHA for 728574d

File tree

Expand file treeCollapse file tree

2 files changed

+12
-3
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+12
-3
lines changed

‎.github/workflows/tests.yml

Copy file name to clipboardExpand all lines: .github/workflows/tests.yml
+11-2Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,16 @@ jobs:
4040
- 7004:7004
4141
- 7005:7005
4242
- 7006:7006
43-
- 7007:7007
4443
env:
45-
STANDALONE: true
44+
STANDALONE: 1
45+
redis-sentinel:
46+
image: bitnami/redis-sentinel:6.0
47+
ports:
48+
- 26379:26379
49+
env:
50+
REDIS_MASTER_HOST: redis
51+
REDIS_MASTER_SET: redis_sentinel
52+
REDIS_SENTINEL_QUORUM: 1
4653
memcached:
4754
image: memcached:1.6.5
4855
ports:
@@ -101,6 +108,8 @@ jobs:
101108
env:
102109
REDIS_HOST: localhost
103110
REDIS_CLUSTER_HOSTS: 'localhost:7000 localhost:7001 localhost:7002 localhost:7003 localhost:7004 localhost:7005'
111+
REDIS_SENTINEL_HOSTS: 'localhost:26379'
112+
REDIS_SENTINEL_SERVICE: redis_sentinel
104113
MESSENGER_REDIS_DSN: redis://127.0.0.1:7006/messages
105114
MESSENGER_AMQP_DSN: amqp://localhost/%2f/messages
106115
MEMCACHED_HOST: localhost

‎src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterSentinelTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterSentinelTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public static function setUpBeforeClass(): void
3737
public function testInvalidDSNHasBothClusterAndSentinel()
3838
{
3939
$this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
40-
$this->expectExceptionMessage('Invalid Redis DSN: cannot use both redis_cluster and redis_sentinel at the same time');
40+
$this->expectExceptionMessage('Cannot use both "redis_cluster" and "redis_sentinel" at the same time:');
4141
$dsn = 'redis:?host[redis1]&host[redis2]&host[redis3]&redis_cluster=1&redis_sentinel=mymaster';
4242
RedisAdapter::createConnection($dsn);
4343
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.