ci debug

snc · Sep 6, 2024 · 1e34291 · 1e34291
1 parent e5f5a90
commit 1e34291
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
         with:
           fetch-depth: 2
       - name: "Install requirements"
@@ -47,7 +47,7 @@ jobs:
           tools: "flex"
 
       - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           dependency-versions: "${{ matrix.dependency-versions }}"
 

diff --git a/src/Factory/PhpredisClientFactory.php b/src/Factory/PhpredisClientFactory.php
@@ -137,18 +137,14 @@ private function createClientFromSentinel(string $class, array $dsns, string $al
                 'readTimeout' => $readTimeout,
                 'auth' => [$parameters['sentinel_username'], $parameters['sentinel_password']],
             ];
-            try {
-                if ($isRelay || version_compare(phpversion('redis'), '6.0', '<')) {
-                    $sentinel = new $sentinelClass(...array_values($args));
-                } else {
-                    $sentinel = new $sentinelClass($args);
-                }
-
-                $address = $sentinel->getMasterAddrByName($masterName);
-            } catch (RedisException | RelayException $e) {
-                continue;
+            if ($isRelay || version_compare(phpversion('redis'), '6.0', '<')) {
+                $sentinel = new $sentinelClass(...array_values($args));
+            } else {
+                $sentinel = new $sentinelClass($args);
             }
 
+            $address = $sentinel->getMasterAddrByName($masterName);
+
             if (!$address) {
                 continue;
             }

diff --git a/tests/Factory/PhpredisClientFactoryTest.php b/tests/Factory/PhpredisClientFactoryTest.php
@@ -118,6 +118,11 @@ public function testCreateSentinelConfig(
         ?string $sentinelUser,
         ?string $sentinelPassword
     ): void {
+        if (!@fsockopen('127.0.0.1', 26379)) {
+            $this->markTestSkipped(sprintf('The %s requires a redis sentinel instance', self::class));
+        }
+        sleep(5);
+
         $this->logger->method('debug')->with(...$this->withConsecutive(
             [$this->stringContains('Executing command "CONNECT 127.0.0.1 6379 5 <null>')],
             ['Executing command "AUTH sncredis"'],
@@ -129,7 +134,6 @@ public function testCreateSentinelConfig(
         $client = $factory->create(
             $sentinelClass,
             [
-                'redis://undefined@localhost:55555', // unreachable instance
                 'redis://sncredis@localhost:26379',
             ],
             [