Fixed unit tests. Updated integration tests to better reflect real world sentinel setup

warslett · warslett · commit 72362583ee3a · 2022-07-22T11:56:11.000+01:00
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -171,7 +171,7 @@ jobs:
         env:
           REDIS_HOST: 'localhost:16379'
           REDIS_CLUSTER_HOSTS: 'localhost:7000 localhost:7001 localhost:7002 localhost:7003 localhost:7004 localhost:7005'
-          REDIS_SENTINEL_HOSTS: 'localhost:26379'
+          REDIS_SENTINEL_HOSTS: 'localhost:26379 localhost:26379 localhost:26379'
           REDIS_SENTINEL_SERVICE: redis_sentinel
           MESSENGER_REDIS_DSN: redis://127.0.0.1:7006/messages
           MESSENGER_AMQP_DSN: amqp://localhost/%2f/messages
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterSentinelTest.php b/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterSentinelTest.php
@@ -47,9 +47,9 @@ public function testInvalidDSNHasBothClusterAndSentinel()
     public function testExceptionMessageWhenFailingToRetrieveMasterInformation()
     {
         $hosts = getenv('REDIS_SENTINEL_HOSTS');
-        $firstHost = explode(' ', $hosts)[0];
+        $dsn = 'redis:?host['.str_replace(' ', ']&host[', $hosts).']';
         $this->expectException(\Symfony\Component\Cache\Exception\InvalidArgumentException::class);
-        $this->expectExceptionMessage('Failed to retrieve master information from master name "invalid-masterset-name" and address "'.$firstHost.'".');
-        AbstractAdapter::createConnection('redis:?host['.str_replace(' ', ']&host[', $hosts).']', ['redis_sentinel' => 'invalid-masterset-name']);
+        $this->expectExceptionMessage('Failed to retrieve master information from master name "invalid-masterset-name" and dsn "'.$dsn.'".');
+        AbstractAdapter::createConnection($dsn, ['redis_sentinel' => 'invalid-masterset-name']);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -47,9 +47,9 @@ public function testInvalidDSNHasBothClusterAndSentinel()`
`47`	`47`	`public function testExceptionMessageWhenFailingToRetrieveMasterInformation()`
`48`	`48`	`{`
`49`	`49`	`$hosts = getenv('REDIS_SENTINEL_HOSTS');`
`50`		`- $firstHost = explode(' ', $hosts)[0];`
	`50`	`+ $dsn = 'redis:?host['.str_replace(' ', ']&host[', $hosts).']';`
`51`	`51`	`$this->expectException(\Symfony\Component\Cache\Exception\InvalidArgumentException::class);`
`52`		`- $this->expectExceptionMessage('Failed to retrieve master information from master name "invalid-masterset-name" and address "'.$firstHost.'".');`
`53`		`- AbstractAdapter::createConnection('redis:?host['.str_replace(' ', ']&host[', $hosts).']', ['redis_sentinel' => 'invalid-masterset-name']);`
	`52`	`+ $this->expectExceptionMessage('Failed to retrieve master information from master name "invalid-masterset-name" and dsn "'.$dsn.'".');`
	`53`	`+ AbstractAdapter::createConnection($dsn, ['redis_sentinel' => 'invalid-masterset-name']);`
`54`	`54`	`}`
`55`	`55`	`}`