Skip to content

Commit 262792a

Browse files
rmcdanielclaude
andcommitted
Merge main into rust-325-waiting-ack-deadline (main merge only)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2 parents ca3f456 + 0329bd7 commit 262792a

2 files changed

Lines changed: 14 additions & 2 deletions

File tree

‎scripts/conformance/server-parity/codec-deadline-cells.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ actors_stopped() {
1919
local name state
2020
for name in "$@"; do
2121
if ! state=$(docker inspect --format '{{.State.Running}}' "$name" 2>&1); then
22-
if [[ "$state" == *"No such object"* || "$state" == *"No such container"* ]]; then
22+
# The Docker CLI on the Ubuntu 26 runner image prints these in lower case.
23+
if [[ "${state,,}" == *"no such object"* || "${state,,}" == *"no such container"* ]]; then
2324
continue
2425
fi
2526
echo "::error::Could not confirm that $name stopped: $state" >&2

‎tests/Unit/ServerParityCodecDeadlineCellsTest.mjs‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ case "$command" in
3838
rm -f "$LIVE/$name" ;;
3939
inspect)
4040
if [[ -n "\${INSPECT_FAILS:-}" ]]; then echo "Cannot connect to the Docker daemon" >&2; exit 1; fi
41-
if [[ -e "$LIVE/$name" ]]; then echo true; else echo "Error: No such object: $name" >&2; exit 1; fi ;;
41+
if [[ -e "$LIVE/$name" ]]; then echo true; exit 0; fi
42+
if [[ -n "\${LOWERCASE_ABSENT:-}" ]]; then echo "error: no such object: $name" >&2; else echo "Error: No such object: $name" >&2; fi
43+
exit 1 ;;
4244
*) exit 2 ;;
4345
esac
4446
`);
@@ -84,6 +86,15 @@ test('every cell runs once, in its own scope, after the previous one stopped, an
8486
assert.deepEqual(states, []);
8587
});
8688

89+
// Run 41338240707 on #925: the Ubuntu 26 runner image's Docker CLI reports a
90+
// removed container in lower case, which the absence check did not accept.
91+
test("a removed container reported in lower case counts as stopped", () => {
92+
const {child, statuses, events} = runCells({LOWERCASE_ABSENT: '1'});
93+
assert.equal(child.status, 0, child.stderr);
94+
assert.deepEqual(events, DATABASES.map(started));
95+
assert.deepEqual(new Set(Object.values(statuses)), new Set(['0']));
96+
});
97+
8798
// Run 40110569900 on #748: the MySQL-family cells exited 2 because their
8899
// unique scopes (cpu-mysql-8.0, ...) held a dot the cell refuses.
89100
test('every cell gets a unique scope the cell accepts', () => {

0 commit comments

Comments
 (0)