Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion cardano_node_tests/cluster_scripts/testnets/start-cluster
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,11 @@ tn_start_node() {

echo "Waiting until replay is finished"
sleep 10
while tail -n 10 "${STATE_CLUSTER}/relay1.stdout" | grep -E -q "replay progress|IPSubscriptionTarget"; do
# No `-q`: it exits on the first match, leaving `tail` writing into a closed pipe, and
# `pipefail` would promote that SIGPIPE status and end the wait early. Plain `grep` scans
# all of its input, so `tail` always finishes writing.
while tail -n 10 "${STATE_CLUSTER}/relay1.stdout" |
grep -E "replay progress|IPSubscriptionTarget" > /dev/null; do
sleep 10
done

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ classifiers = [
dependencies = [
"allure-pytest (>=2.15.2,<3.0.0)",
"cardano-clusterlib (>=0.10.5,<0.11.0)",
"cardonnay (>=0.4.3,<0.5.0)",
"cardonnay (>=0.4.4,<0.5.0)",
"cbor2 (>=5.7.1,<6.0.0)",
"filelock (>=3.20.0,<4.0.0)",
"hypothesis (>=6.148.7,<7.0.0)",
Expand Down
4 changes: 3 additions & 1 deletion runner/runc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,9 @@ add_worktree_git_mount() {
local gitdir main_git_dir

[ -f "$repo_dir/.git" ] || return 0
gitdir="$(sed -n 's/^gitdir: //p' "$repo_dir/.git" | head -n 1)"
# `exit` after the first match keeps this to the first `gitdir:` line. One process, so the
# status is awk's own and an unreadable `.git` still aborts under `errexit`.
gitdir="$(awk '/^gitdir: /{print substr($0, 9); exit}' "$repo_dir/.git")"
if [ -z "$gitdir" ]; then
echo "Warning: '$repo_dir/.git' has no 'gitdir:' line; git will not work inside the container." >&2
return 0
Expand Down
5 changes: 3 additions & 2 deletions scripts/postgres-start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ is_postgres_pid() {
local cmdline
cmdline="$(ps -o args= -p "$pid" 2>/dev/null || echo "")"
# verify process is postgres serving expected data directory
# use grep -F for literal string match (glob metacharacters in pg_dir are safe)
[[ "$cmdline" == *postgres* ]] && printf '%s' "$cmdline" | grep -qF "$pg_dir/data"
# the quoted right-hand side makes this a literal match, so glob metacharacters in
# pg_dir are safe
[[ "$cmdline" == *postgres* && "$cmdline" == *"$pg_dir/data"* ]]
}

kill_postgres() {
Expand Down
8 changes: 4 additions & 4 deletions uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading