Run stack tests against 8.0

Author: vladvildanov

.github/actions/run-tests/action.yml

@@ -109,12 +109,19 @@ runs:
           fi
 
           echo "::endgroup::"
-    
-          if [ "$protocol" == "2" ] || [ "${{inputs.parser-backend}}" != 'hiredis' ]; then
-            echo "::group::RESP${protocol} cluster tests"
-            invoke cluster-tests $eventloop --protocol=${protocol}
-            echo "::endgroup::"
-          fi
+        
+          if (( $REDIS_MAJOR_VERSION < 8 )); then
+            if [ "$protocol" == "2" ] || [ "${{inputs.parser-backend}}" != 'hiredis' ]; then
+              echo "::group::RESP${protocol} cluster tests"
+              invoke cluster-tests $eventloop --protocol=${protocol} --extra-markers="not redismod"
+              echo "::endgroup::"
+            fi
+          else
+            if [ "$protocol" == "2" ] || [ "${{inputs.parser-backend}}" != 'hiredis' ]; then
+              echo "::group::RESP${protocol} cluster tests"
+              invoke cluster-tests $eventloop --protocol=${protocol}
+              echo "::endgroup::"
+            fi
         }
 
         run_tests 2 "${{inputs.event-loop}}"

tasks.py

@@ -69,18 +69,19 @@ def standalone_tests(
 
 
 @task
-def cluster_tests(c, uvloop=False, protocol=2, profile=False):
+def cluster_tests(c, uvloop=False, protocol=2, profile=False, extra_markers=""):
     """Run tests against a redis cluster"""
     profile_arg = "--profile" if profile else ""
     cluster_url = "redis://localhost:16379/0"
     cluster_tls_url = "rediss://localhost:27379/0"
+    extra_markers = f" and {extra_markers}" if extra_markers else ""
     if uvloop:
         run(
-            f"pytest {profile_arg} --protocol={protocol} --cov=./ --cov-report=xml:coverage_cluster_resp{protocol}_uvloop.xml -m 'not onlynoncluster and not redismod and not graph' --redis-url={cluster_url} --redis-ssl-url={cluster_tls_url} --junit-xml=cluster-resp{protocol}-uvloop-results.xml --uvloop"
+            f"pytest {profile_arg} --protocol={protocol} --cov=./ --cov-report=xml:coverage_cluster_resp{protocol}_uvloop.xml -m 'not onlynoncluster and not graph{extra_markers}' --redis-url={cluster_url} --redis-ssl-url={cluster_tls_url} --junit-xml=cluster-resp{protocol}-uvloop-results.xml --uvloop"
         )
     else:
         run(
-            f"pytest  {profile_arg} --protocol={protocol} --cov=./ --cov-report=xml:coverage_cluster_resp{protocol}.xml -m 'not onlynoncluster and not redismod and not graph' --redis-url={cluster_url} --redis-ssl-url={cluster_tls_url} --junit-xml=cluster-resp{protocol}-results.xml"
+            f"pytest  {profile_arg} --protocol={protocol} --cov=./ --cov-report=xml:coverage_cluster_resp{protocol}.xml -m 'not onlynoncluster and not graph{extra_markers}' --redis-url={cluster_url} --redis-ssl-url={cluster_tls_url} --junit-xml=cluster-resp{protocol}-results.xml"
         )