tests

tests

tests

tests

tests

tests

tests

tests

tests

cleaning

Author: Jacq

.github/workflows/tests.yml

@@ -32,10 +32,14 @@ jobs:
     env:
       # The hostname used to communicate with the Redis/Sentinel service containers
       REDIS_HOST: redis
+      # The hostname for redis sentinel
       REDIS_SENTINEL_HOST: redis-sentinel
       # The default Redis port
       REDIS_PORT: 6379
-      REDIS_SENTINEL_PORT: 6379
+      # The default Redis Sentinel port
+      REDIS_SENTINEL_PORT: 26379
+      # The default Redis Sentinel primary
+      REDIS_SENTINEL_SERVICE: myprimary
       # MySQL
       DB_DATABASE: test
       DB_USER: root
@@ -71,8 +75,19 @@ jobs:
         with:
           redis-version: ${{ matrix.redis-version }}
 
+      - name: Generate Redis Sentinel conf compatible with redis 5 assuming 127.0.0.1 (no resolve hostname)
+        run: |
+          REDIS_SENTINEL_IP=127.0.0.1
+          cat <<EOF > sentinel5.conf
+          port ${{ env.REDIS_SENTINEL_PORT }}
+          sentinel monitor ${{ env.REDIS_SENTINEL_SERVICE }} $REDIS_SENTINEL_IP ${{ env.REDIS_PORT }} 2
+          sentinel down-after-milliseconds ${{ env.REDIS_SENTINEL_SERVICE }} 10000
+          sentinel failover-timeout ${{ env.REDIS_SENTINEL_SERVICE }} 180000
+          sentinel parallel-syncs ${{ env.REDIS_SENTINEL_SERVICE }} 2
+          EOF
+
       - name: Start Redis Sentinel
-        run: docker run -d --name ${{env.REDIS_SENTINEL_HOST}} -p 26379:26379 --link redis:redis -v $PWD:/sentinel.conf:/data/sentinel.conf redis:${{ matrix.redis-version }} redis-server sentinel.conf --sentinel
+        run: docker run -d --name ${{env.REDIS_SENTINEL_HOST}} -p 26379:26379 --link redis:redis -v $PWD/sentinel5.conf:/data/sentinel.conf redis:${{ matrix.redis-version }} redis-server sentinel.conf --sentinel
 
       - name: Execute tests (PDO with Sqlite)
         run: vendor/bin/phpunit

src/Prometheus/Storage/RedisSentinel.php

@@ -140,7 +140,6 @@ private function initSentinel(): \RedisSentinel
                 $options['ssl'] = $ssl;
             }
             // @phpstan-ignore arguments.count, argument.type
-            echo(var_export($options,true));
             return new \RedisSentinel($options);
         }
 

tests/Test/Prometheus/Storage/RedisSentinelTest.php

@@ -60,7 +60,10 @@ public function itShouldThrowExceptionWhenInjectedRedisIsNotConnected(): void
     {
         $connection = new \Redis();
         // @phpstan-ignore arguments.count
-        $sentinel = new \RedisSentinel();
+        
+        $sentinel = version_compare((string)phpversion('redis'), '6.0', '>=') ? 
+                        new \RedisSentinel(['host' => '/dev/null']) :
+                        new \RedisSentinel('/dev/null');
 
         self::expectException(StorageException::class);
         self::expectExceptionMessageMatches("/Can't connect to RedisSentinel server\\..*/");
@@ -87,7 +90,6 @@ public function itShouldThrowAnExceptionOnPrimaryFailure(): void
      */
     public function itShouldGetMaster(): void
     { 
-        echo(REDIS_SENTINEL_HOST);
         $redis = new Redis(['host' => REDIS_HOST,
             'sentinel' => ['host' => REDIS_SENTINEL_HOST, 'enable' => true, 'service' => 'myprimary']
         ]);