m1ngsama/TNT
1
0
Fork 0
mirror of https://oauth2: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@github.com/m1ngsama/TNT.git synced 2026-06-26 05:44:38 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: wait for connection limit readiness

Browse source
This commit is contained in:
m1ngsama 2026-05-24 08:53:08 +08:00
parent 84e26e3f74
commit ddf1242b17
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/CHANGELOG.md
View file

@ -60,6 +60,8 @@
external `timeout` helpers, and is available through `make stress-test`. external `timeout` helpers, and is available through `make stress-test`.
- Basic integration tests now wait for real SSH `health` responses instead of - Basic integration tests now wait for real SSH `health` responses instead of
sleeping for a fixed startup delay. sleeping for a fixed startup delay.
- Connection-limit tests now use shared SSH health readiness checks for both
concurrent-session and connection-rate scenarios.
- Refreshed README and quick-reference module maps to match the current - Refreshed README and quick-reference module maps to match the current
`cli_text`, `help_text`, `support_text`, i18n, exec, and rate-limit modules. `cli_text`, `help_text`, `support_text`, i18n, exec, and rate-limit modules.
- NORMAL mode now opens at the latest visible messages instead of the oldest - NORMAL mode now opens at the latest visible messages instead of the oldest

20
tests/test_connection_limits.sh
View file

@ -28,14 +28,16 @@ if [ ! -f "$BIN" ]; then
exit 1 exit 1
fi fi
SSH_OPTS="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -p $PORT" SSH_COMMON_OPTS="-n -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes"
SSH_OPTS="$SSH_COMMON_OPTS -p $PORT"
wait_for_health() { wait_for_health_on_port() {
health_port=$1
for _ in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do for _ in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
if [ -n "$SERVER_PID" ] && ! kill -0 "$SERVER_PID" 2>/dev/null; then if [ -n "$SERVER_PID" ] && ! kill -0 "$SERVER_PID" 2>/dev/null; then
return 1 return 1
fi fi
OUT=$(ssh $SSH_OPTS localhost health 2>/dev/null || true) OUT=$(ssh $SSH_COMMON_OPTS -p "$health_port" localhost health 2>/dev/null || true)
[ "$OUT" = "ok" ] && return 0 [ "$OUT" = "ok" ] && return 0
sleep 1 sleep 1
done done
@ -48,7 +50,7 @@ TNT_LANG=zh TNT_RATE_LIMIT=0 TNT_MAX_CONN_PER_IP=1 "$BIN" -p "$PORT" -d "$STATE_
>"$STATE_DIR/concurrent.log" 2>&1 & >"$STATE_DIR/concurrent.log" 2>&1 &
SERVER_PID=$! SERVER_PID=$!
if wait_for_health; then if wait_for_health_on_port "$PORT"; then
echo "✓ server started for concurrent limit test" echo "✓ server started for concurrent limit test"
PASS=$((PASS + 1)) PASS=$((PASS + 1))
else else
@ -97,14 +99,16 @@ wait "$SERVER_PID" 2>/dev/null || true
SERVER_PID="" SERVER_PID=""
RATE_PORT=$((PORT + 1)) RATE_PORT=$((PORT + 1))
SSH_RATE_OPTS="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -p $RATE_PORT" SSH_RATE_OPTS="$SSH_COMMON_OPTS -p $RATE_PORT"
TNT_LANG=zh TNT_MAX_CONN_PER_IP=10 TNT_MAX_CONN_RATE_PER_IP=2 "$BIN" -p "$RATE_PORT" -d "$STATE_DIR" \ # The health readiness probe is a real SSH connection and counts toward the
# per-IP rate window. Use a burst of 3 so readiness consumes one slot, then the
# test can still assert two successful client connections before the block.
TNT_LANG=zh TNT_MAX_CONN_PER_IP=10 TNT_MAX_CONN_RATE_PER_IP=3 "$BIN" -p "$RATE_PORT" -d "$STATE_DIR" \
>"$STATE_DIR/rate.log" 2>&1 & >"$STATE_DIR/rate.log" 2>&1 &
SERVER_PID=$! SERVER_PID=$!
sleep 2 if wait_for_health_on_port "$RATE_PORT"; then
if kill -0 "$SERVER_PID" 2>/dev/null; then
echo "✓ server started for rate limit test" echo "✓ server started for rate limit test"
PASS=$((PASS + 1)) PASS=$((PASS + 1))
else else