Skip to content

Fix minimal default scope in extract-test-databases.sh for efficient running of client integration tests #228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
data-douser merged 2 commits into from
Apr 7, 2026
Merged

Fix minimal default scope in extract-test-databases.sh for efficient running of client integration tests #228

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2128505
Fix extract-test-databases.sh minimal default scope
data-douser Apr 7, 2026
64a3651
Fixes for test db extraction on windows
data-douser Apr 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/client-integration-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ jobs:
run: ./server/scripts/install-packs.sh

## Extract test databases used in the integration tests.
## Defaults to integration scope (javascript/examples only).
## Query unit tests auto-extract their own databases via `codeql test run`.
- name: MCP Integration Tests - Extract test databases
shell: bash
run: ./server/scripts/extract-test-databases.sh
Expand Down
10 changes: 10 additions & 0 deletions client/src/lib/integration-test-runner.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,6 +785,16 @@ export class IntegrationTestRunner {
// Call the tool with appropriate parameters (timeout is handled by this.callTool)
this.logger.log(`Calling tool ${toolName}`);

// Clean up stale interpretedOutput from prior test runs so that
// directory comparisons only see output from this invocation.
if (toolName === "codeql_query_run" && params.interpretedOutput) {
try {
fs.rmSync(params.interpretedOutput, { recursive: true, force: true });
} catch {
// Ignore — path may not exist yet
}
}
Comment thread
data-douser marked this conversation as resolved.

const result = await this.callTool(toolName, params);

// For monitoring tests, we primarily check if the tool executed successfully
Expand Down
43 changes: 38 additions & 5 deletions server/scripts/extract-test-databases.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,26 @@ set -euo pipefail

## Parse command line arguments
LANGUAGE=""
SCOPE=""

usage() {
cat << EOF
Usage: $0 [OPTIONS]

Extract test databases for CodeQL queries associated with the MCP server.

By default, only databases needed by client integration tests are extracted
(currently: javascript/examples only). Query unit tests (codeql test run)
auto-extract their own databases, so full extraction is rarely needed.
Comment thread
data-douser marked this conversation as resolved.
Outdated

OPTIONS:
--language <lang> Extract databases only for the specified language
--scope <scope> Extract databases for a specific use case
Valid values:
integration - Only databases needed by client integration tests (default)
all - All test databases for all languages
--language <lang> Extract databases only for the specified language (implies --scope all)
Valid values: actions, cpp, csharp, go, java, javascript, python, ruby, rust, swift
-h, --help Show this help message

By default, the script extracts databases for all supported languages.
EOF
}

Expand All @@ -25,6 +32,10 @@ while [[ $# -gt 0 ]]; do
LANGUAGE="$2"
shift 2
;;
--scope)
SCOPE="$2"
shift 2
;;
Comment thread
data-douser marked this conversation as resolved.
-h|--help)
usage
exit 0
Expand All @@ -37,6 +48,18 @@ while [[ $# -gt 0 ]]; do
esac
done

## Validate scope if provided
if [ -n "${SCOPE}" ]; then
case "${SCOPE}" in
integration|all) ;;
*)
echo "Error: Invalid scope '${SCOPE}'" >&2
echo "Valid scopes: integration, all" >&2
exit 1
;;
esac
fi

## Validate language if provided
VALID_LANGUAGES=("actions" "cpp" "csharp" "go" "java" "javascript" "python" "ruby" "rust" "swift")
if [ -n "${LANGUAGE}" ]; then
Expand Down Expand Up @@ -91,7 +114,14 @@ extract_test_databases() {
done < <(find "${_base_dir}/test" -mindepth 1 -maxdepth 1 -type d -print0)
}

## Extract test databases for integration tests.
## Extract test databases based on scope and language filters.
##
## Default (no flags): only databases needed by client integration tests
## (currently just server/ql/javascript/examples).
## --scope all: all languages × examples + tools.
## --language: filter to a single language (implies --scope all).

# --language implies --scope all for that language
if [ -n "${LANGUAGE}" ]; then
echo "Extracting test databases for language: ${LANGUAGE}"
# Special handling for JavaScript which has both examples and tools
Expand All @@ -101,7 +131,7 @@ if [ -n "${LANGUAGE}" ]; then
if [ -d "server/ql/${LANGUAGE}/tools" ]; then
extract_test_databases "server/ql/${LANGUAGE}/tools"
fi
else
elif [ "${SCOPE}" = "all" ]; then
echo "Extracting test databases for all languages..."
for lang in "${VALID_LANGUAGES[@]}"; do
# Special handling for JavaScript which has both examples and tools
Expand All @@ -112,6 +142,9 @@ else
extract_test_databases "server/ql/${lang}/tools"
fi
done
else
echo "Extracting test databases for integration tests only..."
extract_test_databases "server/ql/javascript/examples"
fi

echo "INFO: Test database extraction complete!"
Loading