Skip to content

Commit d02f291

Browse files
junyeong0619junyeong0619
committed
Remove tests/cluster and runtest-cluster, use runtest --cluster instead (#2297)
Remove the obsolete tests/cluster/ directory (run.tcl, cluster.tcl, includes/, helpers/). Delete the deprecated runtest-cluster script. Update .github/workflows/daily.yml to use ./runtest --cluster instead of ./runtest-cluster. Signed-off-by: Jun Yeong Kim <junyeonggim5@gmail.com> Remove runtest-cluster from CMakeLists.txt (#2297) Fix plaintext-port to use pport in cluster tests (#2297)
1 parent 867d77d commit d02f291

File tree

13 files changed

+23
-934
lines changed

13 files changed

+23
-934
lines changed

‎.github/workflows/daily.yml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ jobs:
127127
run: ./runtest-sentinel ${{github.event.inputs.cluster_test_args}}
128128
- name: cluster tests
129129
if: true && !contains(github.event.inputs.skiptests, 'cluster')
130-
run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}}
130+
run: ./runtest --cluster ${{github.event.inputs.cluster_test_args}}
131131
- name: unittest
132132
if: true && !contains(github.event.inputs.skiptests, 'unittest')
133133
run: |
@@ -213,7 +213,7 @@ jobs:
213213
run: ./runtest-sentinel ${{github.event.inputs.cluster_test_args}}
214214
- name: cluster tests
215215
if: true && !contains(github.event.inputs.skiptests, 'cluster')
216-
run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}}
216+
run: ./runtest --cluster ${{github.event.inputs.cluster_test_args}}
217217
- name: unittest
218218
if: true && !contains(github.event.inputs.skiptests, 'unittest')
219219
run: |
@@ -278,7 +278,7 @@ jobs:
278278
run: ./runtest-sentinel ${{github.event.inputs.cluster_test_args}}
279279
- name: cluster tests
280280
if: true && !contains(github.event.inputs.skiptests, 'cluster')
281-
run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}}
281+
run: ./runtest --cluster ${{github.event.inputs.cluster_test_args}}
282282
- name: unittest
283283
if: true && !contains(github.event.inputs.skiptests, 'unittest')
284284
run: |
@@ -336,7 +336,7 @@ jobs:
336336
run: ./runtest-sentinel ${{github.event.inputs.cluster_test_args}}
337337
- name: cluster tests
338338
if: true && !contains(github.event.inputs.skiptests, 'cluster')
339-
run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}}
339+
run: ./runtest --cluster ${{github.event.inputs.cluster_test_args}}
340340
test-ubuntu-no-malloc-usable-size:
341341
runs-on: ubuntu-latest
342342
if: |
@@ -386,7 +386,7 @@ jobs:
386386
run: ./runtest-sentinel ${{github.event.inputs.cluster_test_args}}
387387
- name: cluster tests
388388
if: true && !contains(github.event.inputs.skiptests, 'cluster')
389-
run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}}
389+
run: ./runtest --cluster ${{github.event.inputs.cluster_test_args}}
390390
test-ubuntu-32bit:
391391
runs-on: ubuntu-latest
392392
if: |
@@ -459,7 +459,7 @@ jobs:
459459
run: ./runtest-sentinel ${{github.event.inputs.cluster_test_args}}
460460
- name: cluster tests
461461
if: true && !contains(github.event.inputs.skiptests, 'cluster')
462-
run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}}
462+
run: ./runtest --cluster ${{github.event.inputs.cluster_test_args}}
463463
- name: unittest
464464
if: true && !contains(github.event.inputs.skiptests, 'unittest')
465465
run: |
@@ -523,7 +523,7 @@ jobs:
523523
- name: cluster tests
524524
if: true && !contains(github.event.inputs.skiptests, 'cluster')
525525
run: |
526-
./runtest-cluster --tls ${{github.event.inputs.cluster_test_args}}
526+
./runtest --cluster --tls ${{github.event.inputs.cluster_test_args}}
527527
test-ubuntu-tls-no-tls:
528528
runs-on: ubuntu-latest
529529
if: |
@@ -579,7 +579,7 @@ jobs:
579579
- name: cluster tests
580580
if: true && !contains(github.event.inputs.skiptests, 'cluster')
581581
run: |
582-
./runtest-cluster ${{github.event.inputs.cluster_test_args}}
582+
./runtest --cluster ${{github.event.inputs.cluster_test_args}}
583583
test-ubuntu-io-threads:
584584
runs-on: ubuntu-latest
585585
if: |
@@ -623,7 +623,7 @@ jobs:
623623
run: ./runtest --io-threads --accurate --verbose --tags network --dump-logs ${{github.event.inputs.test_args}}
624624
- name: cluster tests
625625
if: true && !contains(github.event.inputs.skiptests, 'cluster')
626-
run: ./runtest-cluster --io-threads ${{github.event.inputs.cluster_test_args}}
626+
run: ./runtest --cluster --io-threads ${{github.event.inputs.cluster_test_args}}
627627
test-ubuntu-tls-io-threads:
628628
runs-on: ubuntu-latest
629629
if: |
@@ -671,7 +671,7 @@ jobs:
671671
- name: cluster tests
672672
if: true && !contains(github.event.inputs.skiptests, 'cluster')
673673
run: |
674-
./runtest-cluster --io-threads --tls ${{github.event.inputs.cluster_test_args}}
674+
./runtest --cluster --io-threads --tls ${{github.event.inputs.cluster_test_args}}
675675
test-ubuntu-reclaim-cache:
676676
runs-on: ubuntu-latest
677677
if: |
@@ -991,7 +991,7 @@ jobs:
991991
run: ./runtest-sentinel ${{github.event.inputs.cluster_test_args}}
992992
- name: cluster tests
993993
if: true && !contains(github.event.inputs.skiptests, 'cluster')
994-
run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}}
994+
run: ./runtest --cluster ${{github.event.inputs.cluster_test_args}}
995995
- name: unittest
996996
if: true && !contains(github.event.inputs.skiptests, 'unittest')
997997
run: |
@@ -1129,7 +1129,7 @@ jobs:
11291129
run: ./runtest-sentinel ${{github.event.inputs.cluster_test_args}}
11301130
- name: cluster tests
11311131
if: true && !contains(github.event.inputs.skiptests, 'cluster')
1132-
run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}}
1132+
run: ./runtest --cluster ${{github.event.inputs.cluster_test_args}}
11331133
- name: unittest
11341134
if: true && !contains(github.event.inputs.skiptests, 'unittest')
11351135
run: |
@@ -1263,7 +1263,7 @@ jobs:
12631263
run: ./runtest-sentinel ${{github.event.inputs.cluster_test_args}}
12641264
- name: cluster tests
12651265
if: true && !contains(github.event.inputs.skiptests, 'cluster')
1266-
run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}}
1266+
run: ./runtest --cluster ${{github.event.inputs.cluster_test_args}}
12671267
- name: unittest
12681268
if: true && !contains(github.event.inputs.skiptests, 'unittest')
12691269
run: |
@@ -1324,7 +1324,7 @@ jobs:
13241324
run: ./runtest-sentinel ${{github.event.inputs.cluster_test_args}}
13251325
- name: cluster tests
13261326
if: true && !contains(github.event.inputs.skiptests, 'cluster')
1327-
run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}}
1327+
run: ./runtest --cluster ${{github.event.inputs.cluster_test_args}}
13281328
test-rpm-distros-jemalloc:
13291329
if: |
13301330
(github.event_name == 'workflow_call' || github.event_name == 'workflow_dispatch' ||
@@ -1399,7 +1399,7 @@ jobs:
13991399
run: ./runtest-sentinel ${{github.event.inputs.cluster_test_args}}
14001400
- name: cluster tests
14011401
if: true && !contains(github.event.inputs.skiptests, 'cluster')
1402-
run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}}
1402+
run: ./runtest --cluster ${{github.event.inputs.cluster_test_args}}
14031403
test-rpm-distros-tls-module:
14041404
if: |
14051405
(github.event_name == 'workflow_call' || github.event_name == 'workflow_dispatch' ||
@@ -1480,7 +1480,7 @@ jobs:
14801480
- name: cluster tests
14811481
if: true && !contains(github.event.inputs.skiptests, 'cluster')
14821482
run: |
1483-
./runtest-cluster --tls-module ${{github.event.inputs.cluster_test_args}}
1483+
./runtest --cluster --tls-module ${{github.event.inputs.cluster_test_args}}
14841484
test-rpm-distros-tls-module-no-tls:
14851485
if: |
14861486
(github.event_name == 'workflow_call' || github.event_name == 'workflow_dispatch' ||
@@ -1556,7 +1556,7 @@ jobs:
15561556
- name: cluster tests
15571557
if: true && !contains(github.event.inputs.skiptests, 'cluster')
15581558
run: |
1559-
./runtest-cluster ${{github.event.inputs.cluster_test_args}}
1559+
./runtest --cluster ${{github.event.inputs.cluster_test_args}}
15601560
test-macos-latest:
15611561
runs-on: macos-latest
15621562
if: |
@@ -1676,7 +1676,7 @@ jobs:
16761676
run: make SERVER_CFLAGS='-Werror' USE_LIBBACKTRACE=yes
16771677
- name: cluster tests
16781678
if: true && !contains(github.event.inputs.skiptests, 'cluster')
1679-
run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}}
1679+
run: ./runtest --cluster ${{github.event.inputs.cluster_test_args}}
16801680
build-old-macos-versions:
16811681
strategy:
16821682
fail-fast: false
@@ -1806,7 +1806,7 @@ jobs:
18061806
run: ./runtest-sentinel ${{github.event.inputs.cluster_test_args}}
18071807
- name: cluster tests
18081808
if: true && !contains(github.event.inputs.skiptests, 'cluster')
1809-
run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}}
1809+
run: ./runtest --cluster ${{github.event.inputs.cluster_test_args}}
18101810
test-alpine-libc-malloc:
18111811
runs-on: ubuntu-latest
18121812
if: |
@@ -1859,7 +1859,7 @@ jobs:
18591859
run: ./runtest-sentinel ${{github.event.inputs.cluster_test_args}}
18601860
- name: cluster tests
18611861
if: true && !contains(github.event.inputs.skiptests, 'cluster')
1862-
run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}}
1862+
run: ./runtest --cluster ${{github.event.inputs.cluster_test_args}}
18631863
reply-schemas-validator:
18641864
runs-on: ubuntu-latest
18651865
timeout-minutes: 1440
@@ -1909,7 +1909,7 @@ jobs:
19091909
run: ./runtest-sentinel --log-req-res --dont-clean --force-resp3 ${{github.event.inputs.cluster_test_args}}
19101910
- name: cluster tests
19111911
if: true && !contains(github.event.inputs.skiptests, 'cluster')
1912-
run: ./runtest-cluster --log-req-res --dont-clean --force-resp3 ${{github.event.inputs.cluster_test_args}}
1912+
run: ./runtest --cluster --log-req-res --dont-clean --force-resp3 ${{github.event.inputs.cluster_test_args}}
19131913
- name: Install Python dependencies
19141914
uses: py-actions/py-dependency-install@30aa0023464ed4b5b116bd9fbdab87acf01a484e # v4.1.0
19151915
with:

‎CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ export VALKEY_BIN_DIR=\"${CMAKE_BINARY_DIR}/bin\"
7272
endfunction()
7373

7474
copy_runtest_script("runtest")
75-
copy_runtest_script("runtest-cluster")
7675
copy_runtest_script("runtest-moduleapi")
7776
copy_runtest_script("runtest-rdma")
7877
copy_runtest_script("runtest-sentinel")

‎runtest-cluster‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)