Skip to content

Commit 184ef6c

Browse files
committed
Fix[IT]: also execute tests that do not have a consistency mark
Signed-off-by: JEAN-LOUIS "JL" LEROY <[email protected]>
1 parent bf932c4 commit 184ef6c

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

.github/workflows/build.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ jobs:
163163
matrix:
164164
mode: ["legacy_mode", "fsm_mode"]
165165
cluster: ["single", "multi"]
166-
consistency: ["eventual_consistency", "strong_consistency"]
166+
consistency: ["eventual_consistency", "strong_consistency", "(not eventual_consistency and not strong_consistency)"]
167167
fail-fast: false
168168
runs-on: ubuntu-latest
169169
needs: build_ubuntu
@@ -255,7 +255,7 @@ jobs:
255255
deps
256256
/opt/bb/include
257257
key: cache-${{ github.sha }}
258-
258+
259259
- name: Setup core_pattern
260260
run: |
261261
sudo mkdir /cores
@@ -267,7 +267,7 @@ jobs:
267267
pip install -r ${{ github.workspace }}/src/python/requirements.txt
268268
cd src/python
269269
python3 -m blazingmq.dev.fuzztest --broker-dir ${{ github.workspace }}/build/blazingmq/src/applications/bmqbrkr --request ${{ matrix.request }}
270-
270+
271271
- name: Print core information
272272
if: failure()
273273
run: |

src/integration-tests/test_admin_command_routing.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import multiprocessing.pool
3333

3434

35-
def test_primary_rerouting(multi_node: Cluster, domain_urls: tc.DomainUrls) -> None:
35+
def test_primary_rerouting(multi_node: Cluster) -> None:
3636
"""
3737
Test: commands intended only for primary node are automatically routed to
3838
primary node and response it sent back when executed from non-primary
@@ -52,8 +52,6 @@ def test_primary_rerouting(multi_node: Cluster, domain_urls: tc.DomainUrls) -> N
5252
# TODO Skip admin command routing tests until admin command routing is re-enabled
5353
return
5454

55-
du = domain_urls
56-
5755
admin = AdminClient()
5856

5957
# find the first node which is not a known leader
@@ -115,7 +113,7 @@ def test_primary_rerouting(multi_node: Cluster, domain_urls: tc.DomainUrls) -> N
115113
admin.stop()
116114

117115

118-
def test_cluster_rerouting(multi_node: Cluster, domain_urls: tc.DomainUrls) -> None:
116+
def test_cluster_rerouting(multi_node: Cluster) -> None:
119117
"""
120118
Test: commands intended for cluster are routed to all nodes in the cluster
121119
regardless of the node the command is initially sent to
@@ -136,8 +134,6 @@ def test_cluster_rerouting(multi_node: Cluster, domain_urls: tc.DomainUrls) -> N
136134
# TODO Skip admin command routing tests until admin command routing is re-enabled
137135
return
138136

139-
du = domain_urls
140-
141137
admin = AdminClient()
142138

143139
node = multi_node.nodes()[0]
@@ -190,7 +186,7 @@ def test_cluster_rerouting(multi_node: Cluster, domain_urls: tc.DomainUrls) -> N
190186
admin.stop()
191187

192188

193-
def test_multi_response_encoding(multi_node: Cluster, domain_urls: tc.DomainUrls):
189+
def test_multi_response_encoding(multi_node: Cluster):
194190
"""
195191
Test: JSON encoding options work with multiple responses (when routing to
196192
multiple nodes)
@@ -209,8 +205,6 @@ def test_multi_response_encoding(multi_node: Cluster, domain_urls: tc.DomainUrls
209205
# TODO Skip admin command routing tests until admin command routing is re-enabled
210206
return
211207

212-
du = domain_urls
213-
214208
def is_compact(json_str: str) -> bool:
215209
return " " not in json_str
216210

0 commit comments

Comments
 (0)