Skip to content

Commit 200cd84

Browse files
committed
Fix watchdog cleanup and output formatting in SST progress test
- Fix output regex: now matches 'watchdog already exists' or 'watchdog added' - Add cleanup step to remove watchdog from base config after test - Prevents affecting other tests that run after this one
1 parent c6a1ae7 commit 200cd84

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

test/clt-tests/replication/test-sst-progress.rec

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ apt-get install -y iproute2 procps > /dev/null; echo $?
2525
––– comment –––
2626
Add watchdog = 0 to base config if not already present
2727
––– input –––
28-
grep -q "watchdog" test/clt-tests/base/searchd-with-flexible-ports.conf && echo "watchdog already exists" || sed -i '/^searchd {/,/^}/ s/^\([[:space:]]*\)}$/\1\twatchdog = 0\n\1}/' test/clt-tests/base/searchd-with-flexible-ports.conf; echo $?
28+
grep -q "watchdog" test/clt-tests/base/searchd-with-flexible-ports.conf && echo "watchdog already exists" || { sed -i '/^searchd {/,/^}/ s/^\([[:space:]]*\)}$/\1\twatchdog = 0\n\1}/' test/clt-tests/base/searchd-with-flexible-ports.conf && echo "watchdog added"; }
2929
––– output –––
30-
#!/watchdog already exists|0/!#
30+
#!/watchdog already exists|watchdog added/!#
3131
––– comment –––
3232
Start node 1
3333
––– input –––
@@ -157,3 +157,9 @@ mysql -h0 -P2306 -e "SHOW STATUS LIKE 'cluster_sst_test_indexes'\G"
157157
*************************** 1. row ***************************
158158
Counter: cluster_sst_test_indexes
159159
Value: test_table
160+
––– comment –––
161+
Cleanup: Remove watchdog from base config to avoid affecting other tests
162+
––– input –––
163+
sed -i '/watchdog = 0/d' test/clt-tests/base/searchd-with-flexible-ports.conf; echo $?
164+
––– output –––
165+
0

0 commit comments

Comments
 (0)