Added testing with 8.0 (#1510)

* Added testing with 8.0

* Removed old service

* Moved checkout stage above image

* Changed service name

* Override config options for Redis < 7

* Exported to github env

* Print major version output

* Added double quotes

* Test fixes

* Merge cluster and standalone infrastructure

* Removed separate cluster job and merge together with standalone

* Merge stack tests into main test job

* Fixed annotation condition

* tweaks

* Moved docker-compose.yml to root folder

* Added compose file to expected

* fixed in v0.10.1

* move docker file

* Added -all profile in docker-compose

* Removed redis official image, reduce test matrix, moved docker-compose.yml

* Revert docker-compose moving

* test php 8.0 and redis 4.0

* Revert changes related to official image

---------

Co-authored-by: Till Krüss <tillkruss@users.noreply.github.com>

.github/docker-compose.yml

@@ -0,0 +1,73 @@
+---
+
+services:
+
+  redis-official:
+    image: ${REDIS_IMAGE_NAME:-redis:7.4}
+    container_name: redis-standalone
+    healthcheck:
+      test: [ "CMD", "redis-cli", "PING" ]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+    ports:
+      - "6379:6379"
+    profiles:
+      - all
+      - official
+      - standalone
+
+  redis-clients:
+    image: ${REDIS_IMAGE_NAME:-redislabs/client-libs-test:7.4.2}
+    container_name: redis-standalone
+    environment:
+      - TLS_ENABLED=yes
+      - REDIS_CLUSTER=no
+      - PORT=6379
+      - TLS_PORT=6666
+    command: ${REDIS_EXTRA_ARGS:---enable-debug-command yes --enable-module-command yes --tls-auth-clients optional --save ""}
+    ports:
+      - 6379:6379
+      - 6666:6666 # TLS port
+    volumes:
+      - "./dockers/standalone:/redis/work"
+    profiles:
+      - all
+      - clients
+      - standalone
+
+  redis-cluster:
+    image: ${REDIS_CLUSTER_IMAGE_NAME:-redislabs/client-libs-test:7.4.2}
+    container_name: redis-cluster
+    environment:
+      - REDIS_CLUSTER=yes
+      - NODES=6
+      - REPLICAS=1
+      - TLS_ENABLED=yes
+      - PORT=16379
+      - TLS_PORT=27379
+    command: ${REDIS_EXTRA_ARGS:---enable-debug-command yes --enable-module-command yes --tls-auth-clients optional --save ""}
+    ports:
+      - "6372-6377:16379-16384"
+    volumes:
+      - "./dockers/cluster:/redis/work"
+    profiles:
+      - all
+      - clients
+      - cluster
+
+  redis-stack:
+    image: ${REDIS_STACK_IMAGE_NAME:-redislabs/client-libs-test:rs-7.4.0-v2}
+    container_name: redis-stack
+    ports:
+      - "6479:6379"
+    environment:
+      - REDIS_CLUSTER=no
+      - PORT=6379
+    command: ${REDIS_EXTRA_ARGS:---enable-debug-command yes --enable-module-command yes --save ""}
+    volumes:
+      - "./dockers/redis-stack:/redis/work"
+    profiles:
+      - all
+      - clients
+      - stack

.github/workflows/cluster/Dockerfile

@@ -1,7 +0,0 @@
-FROM redis/redis-stack-server:latest as rss
-
-COPY create_cluster.sh /create_cluster.sh
-RUN ls -R /opt/redis-stack
-RUN chmod a+x /create_cluster.sh
-
-ENTRYPOINT [ "/create_cluster.sh"]

.github/workflows/cluster/create_cluster.sh

@@ -1,47 +0,0 @@
-#! /bin/bash
-
-mkdir -p /nodes
-touch /nodes/nodemap
-if [ -z ${START_PORT} ]; then
-    START_PORT=6372
-fi
-if [ -z ${END_PORT} ]; then
-    END_PORT=6377
-fi
-if [ ! -z "$3" ]; then
-    START_PORT=$2
-    START_PORT=$3
-fi
-echo "STARTING: ${START_PORT}"
-echo "ENDING: ${END_PORT}"
-
-for PORT in `seq ${START_PORT} ${END_PORT}`; do
-  mkdir -p /nodes/$PORT
-  if [[ -e /redis.conf ]]; then
-    cp /redis.conf /nodes/$PORT/redis.conf
-  else
-    touch /nodes/$PORT/redis.conf
-  fi
-  cat << EOF >> /nodes/$PORT/redis.conf
-port ${PORT}
-cluster-enabled yes
-daemonize yes
-logfile /redis.log
-dir /nodes/$PORT
-EOF
-
-  set -x
-  /opt/redis-stack/bin/redis-server /nodes/$PORT/redis.conf
-  sleep 1
-  if [ $? -ne 0 ]; then
-    echo "Redis failed to start, exiting."
-    continue
-  fi
-  echo 127.0.0.1:$PORT >> /nodes/nodemap
-done
-if [ -z "${REDIS_PASSWORD}" ]; then
-    echo yes | /opt/redis-stack/bin/redis-cli --cluster create `seq -f 127.0.0.1:%g ${START_PORT} ${END_PORT}` --cluster-replicas 1
-else
-    echo yes | opt/redis-stack/bin/redis-cli -a ${REDIS_PASSWORD} --cluster create `seq -f 127.0.0.1:%g ${START_PORT} ${END_PORT}` --cluster-replicas 1
-fi
-tail -f /redis.log

.github/workflows/cluster/docker-compose.yml

@@ -1,17 +0,0 @@
-version: "3.9"
-services:
-  cluster:
-    container_name: redis-cluster
-    build:
-      context: .
-      dockerfile: Dockerfile
-    ports:
-      - "6372:6372"
-      - "6373:6373"
-      - "6374:6374"
-      - "6375:6375"
-      - "6376:6376"
-      - "6377:6378"
-    volumes:
-      - "./redis.conf:/redis.conf:ro"
-

.github/workflows/cluster/redis.conf

@@ -1,8 +0,0 @@
-# Redis Cluster config file will be shared across all nodes.
-# Do not change the following configurations that are already set:
-# port, cluster-enabled, daemonize, logfile, dir
-protected-mode no
-loadmodule /opt/redis-stack/lib/redisearch.so
-loadmodule /opt/redis-stack/lib/redistimeseries.so
-loadmodule /opt/redis-stack/lib/rejson.so
-loadmodule /opt/redis-stack/lib/redisbloom.so

.github/workflows/stack.yml

@@ -1,71 +0,0 @@
-name: Stack
-
-on:
-  push:
-    branches:
-      - main
-      - v2.**
-  pull_request:
-
-jobs:
-
-  predis:
-    name: PHP ${{ matrix.php }} (Redis Stack ${{ matrix.redis }})
-    runs-on: ubuntu-latest
-
-    services:
-      redis:
-        image: redis/redis-stack-server:${{ matrix.redis }}
-        options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3
-        ports:
-          - 6379:6379
-
-    strategy:
-      fail-fast: false
-      matrix:
-        php:
-          - '7.2'
-          - '7.3'
-          - '7.4'
-          - '8.0'
-          - '8.1'
-          - '8.2'
-          - '8.3'
-          - '8.4'
-        redis:
-          - latest
-          - edge
-
-    # continue-on-error: ${{ matrix.php == '8.5' }}
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup PHP with Composer and extensions
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          extensions: relay
-
-      - name: Get Composer cache directory
-        id: composer-cache
-        run: echo "directory=$(composer config cache-dir)" >> $GITHUB_OUTPUT
-
-      - name: Cache Composer dependencies
-        uses: actions/cache@v3
-        with:
-          path: ${{ steps.composer-cache.outputs.directory }}
-          key: tests-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: tests-php-${{ matrix.php }}-composer
-
-      - name: Install Composer dependencies
-        env:
-          PHP_VERSION: ${{ matrix.php }}
-        run: composer install --ansi --no-progress --prefer-dist
-
-      - name: Run tests
-        run: vendor/bin/phpunit --group realm-stack
-
-      - name: Run tests using Relay
-        run: vendor/bin/phpunit --group realm-stack -c phpunit.relay.xml

.github/workflows/tests.yml

@@ -22,39 +22,72 @@ jobs:
       matrix:
         php:
           - '7.2'
-          - '7.3'
-          - '7.4'
           - '8.0'
-          - '8.1'
-          - '8.2'
           - '8.3'
           - '8.4'
         redis:
-          - 3
-          - 4
-          - 5
-          - 6
-          - 7
-          - 7.4-rc2
-
-    services:
-      redis:
-        image: redis:${{ matrix.redis }}
-        options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3
-        ports:
-          - 6379:6379
+          - '4.0'
+          - '6.2'
+          - '7.2'
+          - '7.4'
+          - '8.0'
 
     steps:
 
+      - name: Resolve container name
+        run: |
+          # Mapping of original redis versions to client test containers
+          declare -A redis_clients_version_mapping=(
+            ["8.0"]="8.0-M04-pre"
+            ["7.4"]="7.4.2"
+            ["7.2"]="7.2.7"
+            ["6.2"]="6.2.17"
+          )
+
+          if [[ -v redis_clients_version_mapping[${{ matrix.redis }}] ]]; then
+            echo "REDIS_IMAGE_NAME=redislabs/client-libs-test:${redis_clients_version_mapping[${{ matrix.redis }}]}" >> $GITHUB_ENV
+            echo "DOCKER_SERVICE=redis-clients" >> $GITHUB_ENV
+
+            redis_major_version=$(echo "${{ matrix.redis }}" | grep -oP '^\d+')
+
+            # Some configuration options available since Redis > 7
+            if (( redis_major_version < 7 )); then
+              echo "REDIS_EXTRA_ARGS="--tls-auth-clients optional --save ''"" >> $GITHUB_ENV
+            fi
+          else
+            echo "REDIS_IMAGE_NAME=redis:${{ matrix.redis }}" >> $GITHUB_ENV
+            echo "DOCKER_SERVICE=redis-official" >> $GITHUB_ENV
+          fi
+
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: Setup PHP with Composer and extensions
+      - name: Start Redis standalone image
+        uses: hoverkraft-tech/compose-action@v2.0.1
+        with:
+          compose-file: .github/docker-compose.yml
+          services: ${{ env.DOCKER_SERVICE }}
+
+      - name: Start Redis stack image
+        uses: hoverkraft-tech/compose-action@v2.0.1
+        if: ${{ matrix.redis == '7.4' }}
+        with:
+          compose-file: .github/docker-compose.yml
+          services: redis-stack
+
+      - name: Start Redis cluster image
+        uses: hoverkraft-tech/compose-action@v2.0.1
+        if: ${{ matrix.redis == '7.4' }}
+        with:
+          compose-file: .github/docker-compose.yml
+          services: redis-cluster
+
+      - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
           extensions: relay
-          coverage: ${{ (matrix.php == '8.1' && matrix.redis == '7') && 'xdebug' || 'none' }}
+          coverage: ${{ (matrix.php == '8.1' && matrix.redis == '7.4') && 'xdebug' || 'none' }}
 
       - name: Install Composer dependencies
         uses: ramsey/composer-install@v2
@@ -63,75 +96,43 @@ jobs:
           composer-options: ${{ matrix.php == '8.0' && '--ignore-platform-reqs' || '' }}
 
       - name: Run tests
-        if: ${{ matrix.php != '8.1' || matrix.redis != '7' }}
+        if: ${{ matrix.php != '8.1' || matrix.redis != '7.4' }}
         run: vendor/bin/phpunit
 
       - name: Run tests with coverage
-        if: ${{ matrix.php == '8.1' && matrix.redis == '7' }}
+        if: ${{ matrix.php == '8.1' && matrix.redis == '7.4' }}
         run: vendor/bin/phpunit --coverage-clover build/logs/clover-default.xml --coverage-filter ./src
 
       - name: Run tests using Relay
-        if: ${{ matrix.php != '8.4' && matrix.redis >= '6' }}
+        if: ${{ matrix.php != '8.4' && matrix.redis >= '6.2' }}
         run: vendor/bin/phpunit -c phpunit.relay.xml
 
       - name: Run tests using Relay with coverage
-        if: ${{ matrix.php == '8.1' && matrix.redis == '7' }}
+        if: ${{ matrix.php == '8.1' && matrix.redis == '7.4' }}
         run: vendor/bin/phpunit -c phpunit.relay.xml --coverage-clover build/logs/clover-relay.xml --coverage-filter ./src
 
+      - name: Run stack tests
+        if: ${{ matrix.redis == '7.4' }}
+        run: vendor/bin/phpunit --group realm-stack
+
+      - name: Run stack tests using Relay
+        if: ${{ matrix.redis == '7.4' }}
+        run: vendor/bin/phpunit --group realm-stack -c phpunit.relay.xml
+
+      - name: Run tests against cluster
+        if: ${{ matrix.redis == '7.4' }}
+        run: |
+          vendor/bin/phpunit --group cluster
+
+      - name: Run tests against cluster using Relay
+        if: ${{ matrix.redis == '7.4' }}
+        run: |
+          vendor/bin/phpunit -c phpunit.relay.xml --group cluster
+
       - name: Send coverage to Coveralls
         env:
             COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        if: ${{ env.COVERALLS_REPO_TOKEN && matrix.php == '8.1' && matrix.redis == '7' }}
+        if: ${{ env.COVERALLS_REPO_TOKEN && matrix.php == '8.1' && matrix.redis == '7.4' }}
         run: |
           wget "https://github.com/php-coveralls/php-coveralls/releases/download/v2.5.3/php-coveralls.phar"
           php ./php-coveralls.phar -v
-
-  predis-cluster:
-
-    name: PHP ${{ matrix.php }} (Redis Cluster latest)
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        php:
-          - '7.2'
-          - '7.3'
-          - '7.4'
-          - '8.0'
-          - '8.1'
-          - '8.2'
-          - '8.3'
-          - '8.4'
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Run Redis cluster
-        uses: hoverkraft-tech/compose-action@v2.0.1
-        with:
-          compose-file: .github/workflows/cluster/docker-compose.yml
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          extensions: relay
-          coverage: ${{ (matrix.php == '8.1') && 'xdebug' || 'none' }}
-
-      - name: Install Composer dependencies
-        uses: ramsey/composer-install@v2
-        with:
-          dependency-versions: highest
-          composer-options: ${{ matrix.php == '8.0' && '--ignore-platform-reqs' || '' }}
-
-      - name: Run tests against cluster
-        run: |
-          sleep 5 # make sure that docker image is setup
-          vendor/bin/phpunit --group cluster
-
-      - name: Run tests against cluster using Relay
-        run: |
-          sleep 5 # make sure nodes are stable and fully joined
-          vendor/bin/phpunit -c phpunit.relay.xml --group cluster

CHANGELOG.md

@@ -17,6 +17,7 @@
 - Explicitly mark nullable parameters as nullable (#1448)
 - Filter out available replicas based on link status flag (#1440)
 - Respect `prefix` for `ZPOPMIN`, `ZPOPMAX`, `ZMSCORE`, `LMOVE`, `BLMOVE`, `SMISMEMBER` and `GEOSEARCH` (#1451, #1453, #1455, #1468)
+- Updated test infrastructure (#1510)
 
 ### Fixed
 - Fixed Relay support when using Redis Cluster (#1397)

phpunit.relay.xml

@@ -38,6 +38,7 @@
     <php>
         <const name="REDIS_SERVER_HOST" value="127.0.0.1" />
         <const name="REDIS_SERVER_PORT" value="6379" />
+        <const name="REDIS_STACK_SERVER_PORT" value="6479" />
         <const name="REDIS_SERVER_DBNUM" value="0" />
         <env name="USE_RELAY" value="true" />
 

phpunit.xml.dist

@@ -50,6 +50,7 @@
     <php>
         <const name="REDIS_SERVER_HOST" value="127.0.0.1" />
         <const name="REDIS_SERVER_PORT" value="6379" />
+        <const name="REDIS_STACK_SERVER_PORT" value="6479" />
         <const name="REDIS_SERVER_DBNUM" value="0" />
         <env name="USE_RELAY" value="false" />
 

tests/PHPUnit/PredisTestCase.php

@@ -175,7 +175,7 @@ abstract class PredisTestCase extends PHPUnit\Framework\TestCase
         return [
             'scheme' => 'tcp',
             'host' => constant('REDIS_SERVER_HOST'),
-            'port' => constant('REDIS_SERVER_PORT'),
+            'port' => ($this->isStackTest()) ? constant('REDIS_STACK_SERVER_PORT') : constant('REDIS_SERVER_PORT'),
             'database' => constant('REDIS_SERVER_DBNUM'),
         ];
     }
@@ -584,6 +584,22 @@ abstract class PredisTestCase extends PHPUnit\Framework\TestCase
             && in_array('cluster', $annotations['method']['group'], true);
     }
 
+    /**
+     * Check annotations if it's matches to stack test scenario.
+     *
+     * @return bool
+     */
+    protected function isStackTest(): bool
+    {
+        $annotations = TestUtil::parseTestMethodAnnotations(
+            get_class($this),
+            $this->getName(false)
+        );
+
+        return isset($annotations['class']['group'])
+        && in_array('realm-stack', $annotations['class']['group'], true);
+    }
+
     /**
      * Parse comma-separated cluster endpoints and convert them into tcp strings.
      *

tests/Predis/Command/Redis/GEOPOS_Test.php

@@ -91,10 +91,10 @@ class GEOPOS_Test extends PredisCommandTestCase
         $redis = $this->getClient();
 
         $redis->geoadd('Sicily', '13.361389', '38.115556', 'Palermo', '15.087269', '37.502669', 'Catania');
-        $this->assertEquals([
-            ['13.36138933897018433', '38.11555639549629859'],
-            ['15.08726745843887329', '37.50266842333162032'],
-        ], $redis->geopos('Sicily', 'Palermo', 'Catania'));
+        $this->assertEqualsWithDelta([
+            [13.36138933897018433, 38.11555639549629859],
+            [15.08726745843887329, 37.50266842333162032],
+        ], $redis->geopos('Sicily', 'Palermo', 'Catania'), 0.1);
     }
 
     /**

tests/Predis/Command/Redis/GEORADIUSBYMEMBER_Test.php

@@ -147,10 +147,10 @@ class GEORADIUSBYMEMBER_Test extends PredisCommandTestCase
         $redis = $this->getClient();
 
         $redis->geoadd('Sicily', '13.361389', '38.115556', 'Palermo', '15.087269', '37.502669', 'Catania', '13.583333', '37.316667', 'Agrigento');
-        $this->assertEquals([
-            ['Agrigento', '0.0000', ['13.5833314061164856', '37.31666804993816555']],
-            ['Palermo', '90.9778', ['13.36138933897018433', '38.11555639549629859']],
-        ], $redis->georadiusbymember('Sicily', 'Agrigento', 100, 'km', 'WITHDIST', 'WITHCOORD'));
+        $this->assertEqualsWithDelta([
+            ['Agrigento', '0.0000', [13.5833314061164856, 37.31666804993816555]],
+            ['Palermo', '90.9778', [13.36138933897018433, 38.11555639549629859]],
+        ], $redis->georadiusbymember('Sicily', 'Agrigento', 100, 'km', 'WITHDIST', 'WITHCOORD'), 0.1);
     }
 
     /**

tests/Predis/Command/Redis/GEORADIUS_Test.php

@@ -149,10 +149,10 @@ class GEORADIUS_Test extends PredisCommandTestCase
         $redis = $this->getClient();
 
         $redis->geoadd('Sicily', '13.361389', '38.115556', 'Palermo', '15.087269', '37.502669', 'Catania');
-        $this->assertEquals([
-            ['Palermo', '190.4424', ['13.36138933897018433', '38.11555639549629859']],
-            ['Catania', '56.4413', ['15.08726745843887329', '37.50266842333162032']],
-        ], $redis->georadius('Sicily', 15, 37, 200, 'km', 'WITHDIST', 'WITHCOORD'));
+        $this->assertEqualsWithDelta([
+            ['Palermo', '190.4424', [13.36138933897018433, 38.11555639549629859]],
+            ['Catania', '56.4413', [15.08726745843887329, 37.50266842333162032]],
+        ], $redis->georadius('Sicily', 15, 37, 200, 'km', 'WITHDIST', 'WITHCOORD'), 0.1);
     }
 
     /**