Fix[IT]: also execute tests that do not have a consistency mark

Signed-off-by: JEAN-LOUIS "JL" LEROY <[email protected]>

Author: jll63

.github/workflows/build.yaml

@@ -163,7 +163,7 @@ jobs:
       matrix:
         mode: ["legacy_mode", "fsm_mode"]
         cluster: ["single", "multi"]
-        consistency: ["eventual_consistency", "strong_consistency"]
+        consistency: ["eventual_consistency", "strong_consistency", "not (eventual_consistency or strong_consistency)"]
       fail-fast: false
     runs-on: ubuntu-latest
     needs: build_ubuntu
@@ -198,7 +198,7 @@ jobs:
           export GOPATH=$HOME/go
           export PATH=$PATH:/usr/local/go/bin:$GOPATH/bin
           pip install -r ${{ github.workspace }}/src/python/requirements.txt
-          ${{ github.workspace }}/src/integration-tests/run-tests \
+          ret=${{ github.workspace }}/src/integration-tests/run-tests \
             "${{ matrix.mode }} and ${{ matrix.cluster }} and ${{ matrix.consistency }}" \
             --log-level ERROR                   \
             --log-file-level=info               \
@@ -209,8 +209,12 @@ jobs:
             --tb long                           \
             --reruns=3                          \
             --durations=0                       \
-            -n logical -v
-
+            -n logical -v -rs
+          if [ "$ret" = 5 ]; then
+            echo "No tests collected. Exiting with 0."
+            exit 0
+          fi
+          exit "$ret"
       - name: Print core information
         if: failure()
         run: |
@@ -255,7 +259,7 @@ jobs:
             deps
             /opt/bb/include
           key: cache-${{ github.sha }}
-      
+
       - name: Setup core_pattern
         run: |
           sudo mkdir /cores
@@ -267,7 +271,7 @@ jobs:
           pip install -r ${{ github.workspace }}/src/python/requirements.txt
           cd src/python
           python3 -m blazingmq.dev.fuzztest --broker-dir ${{ github.workspace }}/build/blazingmq/src/applications/bmqbrkr --request ${{ matrix.request }}
-      
+
       - name: Print core information
         if: failure()
         run: |

src/integration-tests/test_admin_command_routing.py

@@ -30,9 +30,15 @@
 from blazingmq.dev.it.process.client import Client
 import json
 import multiprocessing.pool
+import pytest
+
+pytest.skip(
+    "Skip admin command routing tests until admin command routing is re-enabled",
+    allow_module_level=True,
+)
 
 
-def test_primary_rerouting(multi_node: Cluster, domain_urls: tc.DomainUrls) -> None:
+def test_primary_rerouting(multi_node: Cluster) -> None:
     """
     Test: commands intended only for primary node are automatically routed to
           primary node and response it sent back when executed from non-primary
@@ -49,11 +55,6 @@ def test_primary_rerouting(multi_node: Cluster, domain_urls: tc.DomainUrls) -> N
     - CLUSTERS CLUSTER <name> STORAGE PARTITION <partitionId> ENABLE/DISABLE
     """
 
-    # TODO Skip admin command routing tests until admin command routing is re-enabled
-    return
-
-    du = domain_urls
-
     admin = AdminClient()
 
     # find the first node which is not a known leader
@@ -115,7 +116,7 @@ def test_primary_rerouting(multi_node: Cluster, domain_urls: tc.DomainUrls) -> N
     admin.stop()
 
 
-def test_cluster_rerouting(multi_node: Cluster, domain_urls: tc.DomainUrls) -> None:
+def test_cluster_rerouting(multi_node: Cluster) -> None:
     """
     Test: commands intended for cluster are routed to all nodes in the cluster
           regardless of the node the command is initially sent to
@@ -133,11 +134,6 @@ def test_cluster_rerouting(multi_node: Cluster, domain_urls: tc.DomainUrls) -> N
     - CLUSTERS CLUSTER <name> STATE ELECTOR GET_ALL <param> <value>
     """
 
-    # TODO Skip admin command routing tests until admin command routing is re-enabled
-    return
-
-    du = domain_urls
-
     admin = AdminClient()
 
     node = multi_node.nodes()[0]
@@ -190,7 +186,7 @@ def test_cluster_rerouting(multi_node: Cluster, domain_urls: tc.DomainUrls) -> N
     admin.stop()
 
 
-def test_multi_response_encoding(multi_node: Cluster, domain_urls: tc.DomainUrls):
+def test_multi_response_encoding(multi_node: Cluster):
     """
     Test: JSON encoding options work with multiple responses (when routing to
           multiple nodes)
@@ -206,11 +202,6 @@ def test_multi_response_encoding(multi_node: Cluster, domain_urls: tc.DomainUrls
 
     """
 
-    # TODO Skip admin command routing tests until admin command routing is re-enabled
-    return
-
-    du = domain_urls
-
     def is_compact(json_str: str) -> bool:
         return "    " not in json_str
 
@@ -277,8 +268,6 @@ def test_concurrently_routed_commands(multi_node: Cluster, domain_urls: tc.Domai
     Stage 2: Issue command in parallel
     Stage 3: Expect
     """
-    # TODO Skip admin command routing tests until admin command routing is re-enabled
-    return
 
     # Connect a client to each node in the cluster
     clients = []