diff --git a/cli/tests/marmot/tests-extras.sh b/cli/tests/marmot/tests-extras.sh index d61e9a7330..fa602e656b 100644 --- a/cli/tests/marmot/tests-extras.sh +++ b/cli/tests/marmot/tests-extras.sh @@ -89,7 +89,10 @@ test_10_concurrent_commits() { sleep 10 local b_name - b_name=$(wn_b --json groups show "$mls_gid" 2>/dev/null | jq -r '(.result // .) | .name // empty') + # whitenoise-rs ≥ v0.2.x wraps the group payload one level deeper as + # `{"result": {"group": {…name…}}}`; the older shape was a bare group + # object under `.result`. Accept both. + b_name=$(wn_b --json groups show "$mls_gid" 2>/dev/null | jq -r '(.result // .) | (.group // .) | .name // empty') local a_name a_name=$(amy_field '.name' marmot group show "$gid" 2>/dev/null || echo "") diff --git a/cli/tests/marmot/tests-manage.sh b/cli/tests/marmot/tests-manage.sh index 7923811ab3..03763d4207 100644 --- a/cli/tests/marmot/tests-manage.sh +++ b/cli/tests/marmot/tests-manage.sh @@ -74,7 +74,11 @@ test_07_metadata_rename() { local deadline=$(( $(date +%s) + 120 )) seen="" while [[ $(date +%s) -lt $deadline ]]; do - seen=$(wn_b --json groups show "$mls_gid" 2>/dev/null | jq -r '(.result // .) | .name // empty') + # whitenoise-rs ≥ v0.2.x wraps the group payload one level deeper as + # `{"result": {"group": {…name…}}}`; older builds returned the bare + # group object under `.result`. Probe both shapes so the test survives + # either schema. + seen=$(wn_b --json groups show "$mls_gid" 2>/dev/null | jq -r '(.result // .) | (.group // .) | .name // empty') [[ "$seen" == "Interop-02-renamed" ]] && break sleep 3 done