Update: tests

NHZEX · Feb 18, 2024 · 04816af · 04816af
1 parent df2ae7b
commit 04816af
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -277,27 +277,19 @@ jobs:
           docker exec postgres psql -d db_imi_test -U root -f /imi/.github/pgsql.sql
           echo "::endgroup::"
           echo "test_prepared=1" >> $GITHUB_ENV
-
-      - name: Get redis cluster nodes
-        id: redis-cluster
-        run: |
-          echo "cluster-nodes=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' redis-cluster-node-0):6479,$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' redis-cluster-node-1):6479,$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' redis-cluster-node-2):6479,$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' redis-cluster-node-3):6479,$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' redis-cluster-node-4):6479,$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' redis-cluster-node-5):6479" >> $GITHUB_OUTPUT
-          echo "cluster-node0=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' redis-cluster-node-0)" >> $GITHUB_OUTPUT
       - name: Test Env
         if: ${{ env.test_prepared && always() }}
         run: |
           docker ps
-          echo ">>> redis-cluster-node-0, ${{ steps.redis-cluster.outputs.cluster-node0 }}"
-          echo ">>> redis-cluster-nodes, ${{ steps.redis-cluster.outputs.cluster-nodes }}"
-          echo -e 'auth l83aa26\r\ninfo server' | nc ${{ steps.redis-cluster.outputs.cluster-node0 }} 6479 -w 1
-          echo -e 'auth l83aa26\r\ncluster info\r\ncluster nodes' | nc ${{ steps.redis-cluster.outputs.cluster-node0 }} 6479 -w 1
+          echo -e 'auth l83aa26\r\ninfo server' | nc 127.0.0.1 6479 -w 1
+          echo -e 'auth l83aa26\r\ncluster info\r\ncluster nodes' | nc 127.0.0.1 6479 -w 1
       - name: Test
         if: ${{ env.test_prepared && always() }}
         run: composer test
       - name: Test redis
         if: ${{ env.test_prepared && always() }}
         env:
-          REDIS_SERVER_CLUSTER_SEEDS: ${{ steps.redis-cluster.outputs.cluster-nodes }}
+          REDIS_SERVER_CLUSTER_SEEDS: "127.0.0.1:6479,127.0.0.1:6480,127.0.0.1:6481,127.0.0.1:6482,127.0.0.1:6483,127.0.0.1:6484"
         run: composer test-redis
       # - name: Test swoole
       #   if: ${{ env.test_prepared && always() }}

diff --git a/src/Components/redis/tests/phpunit.xml b/src/Components/redis/tests/phpunit.xml
@@ -20,6 +20,6 @@
 <!--        <env name="XDEBUG_MODE" value="off" force="true"/>-->
         <env name="REDIS_SERVER_PASSWORD" value="" force="false"/>
         <env name="REDIS_SERVER_CLUSTER_PASSWORD" value="l83aa26" force="false"/>
-        <env name="REDIS_SERVER_CLUSTER_SEEDS" value="redis-cluster-node-0:6479,redis-cluster-node-1:6479,redis-cluster-node-2:6479,redis-cluster-node-3:6479,redis-cluster-node-4:6479,redis-cluster-node-5:6479" force="false"/>
+        <env name="REDIS_SERVER_CLUSTER_SEEDS" value="redis-cluster-node-0:6479,redis-cluster-node-1:6480,redis-cluster-node-2:6481,redis-cluster-node-3:6482,redis-cluster-node-4:6483,redis-cluster-node-5:6484" force="false"/>
     </php>
 </phpunit>