From bd84394dc5eb19399709caeac400cb243d776dd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Deruss=C3=A9?= <jeremy@derusse.com>
Date: Mon, 16 Nov 2020 16:43:27 +0100
Subject: [PATCH] Run Redis Sentinel tests in GithubAction

---
 .github/workflows/tests.yml                         | 13 +++++++++++--
 .../Tests/Adapter/RedisAdapterSentinelTest.php      |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index a5d6ea0e9a..5732b53403 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -29,9 +29,16 @@ jobs:
                     - 7004:7004
                     - 7005:7005
                     - 7006:7006
-                    - 7007:7007
                 env:
-                    STANDALONE: true
+                    STANDALONE: 1
+            redis-sentinel:
+                image: bitnami/redis-sentinel:6.0
+                ports:
+                    - 26379:26379
+                env:
+                    REDIS_MASTER_HOST: redis
+                    REDIS_MASTER_SET: redis_sentinel
+                    REDIS_SENTINEL_QUORUM: 1
             memcached:
                 image: memcached:1.6.5
                 ports:
@@ -84,6 +91,8 @@ jobs:
                 env:
                     REDIS_HOST: localhost
                     REDIS_CLUSTER_HOSTS: 'localhost:7000 localhost:7001 localhost:7002 localhost:7003 localhost:7004 localhost:7005'
+                    REDIS_SENTINEL_HOSTS: 'localhost:26379'
+                    REDIS_SENTINEL_SERVICE: redis_sentinel
                     MESSENGER_REDIS_DSN: redis://127.0.0.1:7006/messages
                     MESSENGER_AMQP_DSN: amqp://localhost/%2f/messages
                     MEMCACHED_HOST: localhost
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterSentinelTest.php b/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterSentinelTest.php
index 09f563036b..82b9f08b65 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterSentinelTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterSentinelTest.php
@@ -37,7 +37,7 @@ class RedisAdapterSentinelTest extends AbstractRedisAdapterTest
     public function testInvalidDSNHasBothClusterAndSentinel()
     {
         $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('Invalid Redis DSN: cannot use both redis_cluster and redis_sentinel at the same time');
+        $this->expectExceptionMessage('Cannot use both "redis_cluster" and "redis_sentinel" at the same time:');
         $dsn = 'redis:?host[redis1]&host[redis2]&host[redis3]&redis_cluster=1&redis_sentinel=mymaster';
         RedisAdapter::createConnection($dsn);
     }