Skip to content

bugfix/3447: Address quality-debt in tests/test-dual-cli-e2e.sh #4565

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
alex-solovyev merged 1 commit into from
Mar 14, 2026
Merged

bugfix/3447: Address quality-debt in tests/test-dual-cli-e2e.sh #4565

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 20 additions & 8 deletions tests/test-dual-cli-e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,12 +175,13 @@ cleanup() {
git -C "$TEST_REPO" worktree list --porcelain 2>/dev/null |
grep "^worktree " | cut -d' ' -f2- | while IFS= read -r wt_path; do
if [[ "$wt_path" != "$TEST_REPO" && -d "$wt_path" ]]; then
git -C "$TEST_REPO" worktree remove "$wt_path" --force 2>/dev/null || rm -rf "$wt_path"
git -C "$TEST_REPO" worktree remove "$wt_path" --force || rm -rf "$wt_path"
fi
done
git -C "$TEST_REPO" worktree prune 2>/dev/null || true
git -C "$TEST_REPO" worktree prune -q || true
fi
rm -rf "$TEST_DIR"
return 0
}
trap cleanup EXIT

Expand All @@ -193,27 +194,37 @@ sup() {
# Helper: query the test DB directly
test_db() {
sqlite3 -cmd ".timeout 5000" "$TEST_DIR/supervisor/supervisor.db" "$@"
return $?
}

# Helper: get task status
get_status() {
test_db "SELECT status FROM tasks WHERE id = '$1';"
local task_id="$1"
test_db "SELECT status FROM tasks WHERE id = '$task_id';"
return $?
}

# Helper: get task field
get_field() {
test_db "SELECT $2 FROM tasks WHERE id = '$1';"
local task_id="$1"
local field="$2"
test_db "SELECT $field FROM tasks WHERE id = '$task_id';"
return $?
}

# Helper: create a mock worker log file
create_log() {
local task_id="$1"
local content="$2"
local log_file="$TEST_DIR/supervisor/logs/${task_id}.log"
local task_id
local content
local log_file
task_id="$1"
content="$2"
log_file="$TEST_DIR/supervisor/logs/${task_id}.log"
mkdir -p "$TEST_DIR/supervisor/logs"
echo "$content" >"$log_file"
test_db "UPDATE tasks SET log_file = '$log_file' WHERE id = '$task_id';"
echo "$log_file"
return 0
}

# Helper: source supervisor modules for unit-level testing
Expand All @@ -230,7 +241,8 @@ run_in_supervisor_env() {
source '$SUPERVISOR_DIR_MODULE/_common.sh'
source '$SUPERVISOR_DIR_MODULE/dispatch.sh'
$1
" 2>/dev/null
"
return $?
}

# ============================================================
Expand Down
Loading