Skip to content

Commit b8cd0e8

Browse files
mojwangclaude
mojwang
and
claude
committed
feat: add MCP integration tests and standardize timeout handling
Near-term improvements: - Add comprehensive MCP server connectivity integration tests - Standardize timeout command approach with run_with_timeout function - Test server initialization, response times, and API key security Integration tests include: - MCP server connectivity verification - Critical server initialization checks - API key file permission validation (600) - Server response time benchmarking Timeout standardization: - Created run_with_timeout() in common.sh - Unified approach: gtimeout > timeout > fallback - Applied consistently across all scripts 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
1 parent 0c61db2 commit b8cd0e8

4 files changed

Lines changed: 182 additions & 45 deletions

File tree

‎lib/common.sh‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,39 @@ command_exists() {
112112
command -v "$1" &> /dev/null
113113
}
114114

115+
# Run command with timeout (standardized approach)
116+
# Usage: run_with_timeout SECONDS COMMAND [ARGS...]
117+
run_with_timeout() {
118+
local timeout_seconds="$1"
119+
shift
120+
121+
# Prefer gtimeout (GNU coreutils on macOS), then timeout, then fallback
122+
if command_exists gtimeout; then
123+
gtimeout "${timeout_seconds}s" "$@"
124+
elif command_exists timeout; then
125+
timeout "${timeout_seconds}s" "$@"
126+
else
127+
# Fallback: run in background and kill after timeout
128+
"$@" &
129+
local pid=$!
130+
local count=0
131+
132+
while kill -0 $pid 2>/dev/null; do
133+
if [[ $count -ge $timeout_seconds ]]; then
134+
kill -TERM $pid 2>/dev/null || true
135+
sleep 1
136+
kill -0 $pid 2>/dev/null && kill -KILL $pid 2>/dev/null || true
137+
return 124 # Standard timeout exit code
138+
fi
139+
sleep 1
140+
((count++))
141+
done
142+
143+
wait $pid
144+
return $?
145+
fi
146+
}
147+
115148
# Check if running on macOS
116149
require_macos() {
117150
if [[ "$OS_TYPE" != "Darwin" ]]; then

‎scripts/debug-mcp-servers.sh‎

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -24,30 +24,8 @@ test_server() {
2424

2525
echo -n "Testing $name... "
2626

27-
# Use gtimeout if available, otherwise use timeout
28-
if command -v gtimeout >/dev/null 2>&1; then
29-
TIMEOUT_CMD="gtimeout 5s"
30-
elif command -v timeout >/dev/null 2>&1; then
31-
TIMEOUT_CMD="timeout 5s"
32-
else
33-
# Fallback: run in background and kill after 5 seconds
34-
local tmp_file=$(mktemp /tmp/mcp_test_XXXXXX.tmp)
35-
("$command" "${args[@]}" 2>&1 | grep -q "Content-Type: application/vnd.mcp" && echo "OK" > "$tmp_file") &
36-
local pid=$!
37-
sleep 5
38-
kill -0 $pid 2>/dev/null && kill -9 $pid 2>/dev/null
39-
if [ -f "$tmp_file" ] && [ -s "$tmp_file" ]; then
40-
rm -f "$tmp_file"
41-
echo "✓ Working"
42-
return 0
43-
else
44-
rm -f "$tmp_file"
45-
echo "✗ Failed"
46-
return 1
47-
fi
48-
fi
49-
50-
if $TIMEOUT_CMD "$command" "${args[@]}" 2>&1 | grep -q "Content-Type: application/vnd.mcp"; then
27+
# Use standardized timeout function from common.sh
28+
if run_with_timeout 5 "$command" "${args[@]}" 2>&1 | grep -q "Content-Type: application/vnd.mcp"; then
5129
echo "✓ Working"
5230
return 0
5331
else

‎scripts/setup-claude-mcp.sh‎

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -360,31 +360,18 @@ build_node_server() {
360360
init_npm_noninteractive "$server_path"
361361

362362
# Install dependencies with timeout
363-
local npm_timeout=120
364-
if command -v gtimeout &>/dev/null; then
365-
gtimeout ${npm_timeout}s npm install --no-audit --no-fund >/dev/null 2>&1 || {
366-
print_error "npm install failed or timed out for $server_name"
367-
return 1
368-
}
369-
else
370-
npm install --no-audit --no-fund >/dev/null 2>&1 || {
371-
print_error "npm install failed for $server_name"
372-
return 1
373-
}
363+
# Use standardized timeout function
364+
if ! run_with_timeout 120 npm install --no-audit --no-fund >/dev/null 2>&1; then
365+
print_error "npm install failed or timed out for $server_name"
366+
return 1
374367
fi
375368

376369
# Build if build script exists (with timeout)
377370
if grep -q '"build"' package.json 2>/dev/null; then
378-
local build_timeout=60
379-
if command -v gtimeout &>/dev/null; then
380-
gtimeout ${build_timeout}s npm run build >/dev/null 2>&1 || {
381-
print_warning "Build failed or timed out for $server_name, continuing anyway..."
382-
}
383-
else
384-
npm run build >/dev/null 2>&1 || {
385-
print_warning "Build failed for $server_name, continuing anyway..."
386-
}
387-
fi
371+
# Use standardized timeout function
372+
run_with_timeout 60 npm run build >/dev/null 2>&1 || {
373+
print_warning "Build failed or timed out for $server_name, continuing anyway..."
374+
}
388375
fi
389376

390377
return 0

‎tests/integration/test_mcp_connectivity.sh‎

Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
#!/usr/bin/env bash
2+
# Test MCP server connectivity
3+
4+
set -e
5+
6+
# Source test framework
7+
source "$(dirname "$0")/../test_framework.sh"
8+
9+
# Test functions
10+
test_mcp_server_connectivity() {
11+
local test_name="MCP Server Connectivity"
12+
13+
# Skip if Claude Code not installed
14+
if ! command -v claude &>/dev/null; then
15+
skip_test "$test_name" "Claude Code not installed"
16+
return
17+
fi
18+
19+
# Check if any MCP servers are configured
20+
local servers_json
21+
servers_json=$(claude settings show 2>/dev/null | jq -r '.mcpServers // {}' 2>/dev/null || echo "{}")
22+
23+
if [[ "$servers_json" == "{}" ]] || [[ -z "$servers_json" ]]; then
24+
skip_test "$test_name" "No MCP servers configured"
25+
return
26+
fi
27+
28+
# Test each configured server
29+
local server_count=0
30+
local working_count=0
31+
local failed_servers=()
32+
33+
while IFS= read -r server_name; do
34+
((server_count++))
35+
36+
# Try to list resources from the server (basic connectivity test)
37+
if claude mcp list 2>/dev/null | grep -q "^${server_name}:"; then
38+
((working_count++))
39+
echo " ✓ Server '$server_name' is responsive"
40+
else
41+
failed_servers+=("$server_name")
42+
echo " ✗ Server '$server_name' is not responsive"
43+
fi
44+
done < <(echo "$servers_json" | jq -r 'keys[]' 2>/dev/null)
45+
46+
if [[ $server_count -eq 0 ]]; then
47+
skip_test "$test_name" "No servers found in configuration"
48+
elif [[ $working_count -eq $server_count ]]; then
49+
pass_test "$test_name" "All $server_count servers are responsive"
50+
elif [[ $working_count -gt 0 ]]; then
51+
fail_test "$test_name" "$working_count/$server_count servers responsive. Failed: ${failed_servers[*]}"
52+
else
53+
fail_test "$test_name" "No servers are responsive"
54+
fi
55+
}
56+
57+
test_mcp_server_initialization() {
58+
local test_name="MCP Server Initialization"
59+
60+
# Skip if Claude Code not installed
61+
if ! command -v claude &>/dev/null; then
62+
skip_test "$test_name" "Claude Code not installed"
63+
return
64+
fi
65+
66+
# Check specific critical servers
67+
local critical_servers=("filesystem" "git")
68+
local all_working=true
69+
70+
for server in "${critical_servers[@]}"; do
71+
if claude mcp list 2>/dev/null | grep -q "^${server}:"; then
72+
echo " ✓ Critical server '$server' initialized"
73+
else
74+
echo " ✗ Critical server '$server' not initialized"
75+
all_working=false
76+
fi
77+
done
78+
79+
if [[ "$all_working" == "true" ]]; then
80+
pass_test "$test_name" "All critical servers initialized"
81+
else
82+
fail_test "$test_name" "Some critical servers not initialized"
83+
fi
84+
}
85+
86+
test_mcp_api_key_configuration() {
87+
local test_name="MCP API Key Configuration"
88+
89+
# Check if API keys file exists with correct permissions
90+
local api_keys_file="$HOME/.config/zsh/51-api-keys.zsh"
91+
92+
if [[ -f "$api_keys_file" ]]; then
93+
# Check file permissions (should be 600)
94+
local perms=$(stat -f "%OLp" "$api_keys_file" 2>/dev/null || stat -c "%a" "$api_keys_file" 2>/dev/null)
95+
96+
if [[ "$perms" == "600" ]]; then
97+
pass_test "$test_name" "API keys file has secure permissions (600)"
98+
else
99+
fail_test "$test_name" "API keys file has insecure permissions ($perms, expected 600)"
100+
fi
101+
else
102+
skip_test "$test_name" "API keys file not found"
103+
fi
104+
}
105+
106+
test_mcp_server_response_time() {
107+
local test_name="MCP Server Response Time"
108+
109+
# Skip if Claude Code not installed
110+
if ! command -v claude &>/dev/null; then
111+
skip_test "$test_name" "Claude Code not installed"
112+
return
113+
fi
114+
115+
# Test response time for filesystem server (most commonly used)
116+
local start_time=$(date +%s)
117+
118+
if timeout 5 claude mcp list 2>/dev/null | grep -q "^filesystem:"; then
119+
local end_time=$(date +%s)
120+
local response_time=$((end_time - start_time))
121+
122+
if [[ $response_time -le 2 ]]; then
123+
pass_test "$test_name" "Server responded in ${response_time}s (≤2s)"
124+
elif [[ $response_time -le 5 ]]; then
125+
warn_test "$test_name" "Server responded in ${response_time}s (>2s but ≤5s)"
126+
else
127+
fail_test "$test_name" "Server responded in ${response_time}s (>5s)"
128+
fi
129+
else
130+
fail_test "$test_name" "Server did not respond within 5 seconds"
131+
fi
132+
}
133+
134+
# Run tests
135+
run_test_suite "MCP Integration" \
136+
test_mcp_server_connectivity \
137+
test_mcp_server_initialization \
138+
test_mcp_api_key_configuration \
139+
test_mcp_server_response_time

0 commit comments

Comments
 (0)