amadan
Say what is true of a stalled log sink: close does not wait, the pump cannot be interrupted
Astra on #20, round 4: with the sink stalled, the log pump stays alive
after close — closing its channel cannot interrupt a Write already
blocked — and the test released the sink before checking the baseline,
which hid that.
Go cannot interrupt a blocked io.Writer, so the code and the test now
say so instead. The pump's and close's comments state the limit: a
write blocked inside the logger can only finish or die with the
process, and shutdown deliberately does not wait for it.
TestMailQueueCloseIsBoundedWithAStalledLogger now asserts, with the
sink STILL stalled, that close returned within its bound, the worker has
exited, and at most the one pump goroutine remains; then it releases
the sink and asserts the pump exits and the goroutine count is back at
baseline. It fails if close waits on the pump, or if the worker logs
through anything that can block ("close hung on a stalled log sink" for
both mutations).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2 files changed,
+43
−13
internal/slides/mailqueue.go+10 −1internal/slides/mailqueue_test.go+33 −12
CI passed — run details
CI log
=== gate ===
=== rust: fmt
=== rust: clippy
Finished `dev` profile [unoptimized + debuginfo] target(s) in 0.08s
=== wasm: the artifact the host embeds
Finished `dev` profile [unoptimized + debuginfo] target(s) in 0.03s
Finished `release` profile [optimized] target(s) in 0.07s
core/target/wasm32-unknown-unknown/release/slides_core.wasm (1228229 bytes)
=== the embedded wasm must match a fresh build
=== rust: test
Finished `test` profile [unoptimized + debuginfo] target(s) in 0.02s
Running unittests src/lib.rs (core/target/debug/deps/slides_core-929bfceb2edd4a94)
running 30 tests
test layout::tests::aside_region_rect ... ok
test check::tests::the_empty_document_passes ... ok
test layout::tests::default_region_by_kind ... ok
test layout::tests::body_region_rect_narrows_for_an_aside ... ok
test layout::tests::heading_region_rect ... ok
test layout::tests::media_region_rect ... ok
test markdown::tests::empty_input_is_no_paragraphs_and_lines_keep_blanks ... ok
test markdown::tests::paragraphs_split_on_blank_lines_and_list_markers ... ok
test markdown::tests::inline_marks ... ok
test markdown::tests::marks_nest_and_links_carry_marks ... ok
test layout::tests::to_canvas_narrows_body_when_an_aside_is_present ... ok
test check::tests::an_element_inside_a_paragraph_is_reported ... ok
test check::tests::bare_text_at_fragment_level_is_reported ... ok
test layout::tests::to_canvas_splits_a_shared_region_equally_and_sets_z_by_index ... ok
test check::tests::y_prosemirror_shapes_pass ... ok
test check::tests::what_the_ops_write_passes ... ok
test layout::tests::to_flow_is_a_no_op_when_already_in_order ... ok
test layout::tests::to_flow_classifies_by_position_and_kind ... ok
test schema::tests::an_empty_map_reads_as_a_set_mark ... ok
test check::tests::a_non_paragraph_child_is_reported ... ok
test schema::tests::an_href_map_without_a_string_url_reads_as_no_link ... ok
test schema::tests::href_is_written_as_a_one_key_map_and_reads_back ... ok
test schema::tests::href_written_as_a_plain_string_still_reads_back ... ok
test layout::tests::to_flow_orders_y_then_x ... ok
test check::tests::an_unknown_formatting_attribute_is_reported ... ok
test view::tests::malformed_fonts_are_null ... ok
test view::tests::malformed_box_is_null_and_phone_keeps_only_typed_fields ... ok
test view::tests::malformed_background_is_the_default ... ok
test view::tests::assets_are_typed_or_skipped ... ok
test layout::tests::to_flow_keeps_a_concurrent_text_edit ... ok
test result: ok. 30 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Running tests/no_host_imports.rs (core/target/debug/deps/no_host_imports-184c0d8bf00e14f9)
running 1 test
test no_host_imports ... ok
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Running tests/ops.rs (core/target/debug/deps/ops-256addce27f366d1)
running 12 tests
test ops_are_atomic ... ok
test add_slide_then_view_lists_it ... ok
test add_block_with_markdown_produces_runs ... ok
test layout_switch_assigns_boxes ... ok
test remove_block_drops_it_from_columns_children ... ok
test columns_children_must_name_blocks_on_the_slide ... ok
test duplicate_slide_remaps_columns_children ... ok
test columns_children_have_one_parent_and_no_cycles ... ok
test move_block_keeps_a_concurrent_text_edit ... ok
test update_roundtrip ... ok
test move_slide_keeps_a_concurrent_text_edit ... ok
test remaining_ops_roundtrip ... ok
test result: ok. 12 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.01s
Doc-tests slides_core
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
=== rust: fmt (pdf)
=== rust: clippy (pdf)
Finished `dev` profile [unoptimized + debuginfo] target(s) in 0.07s
=== wasm: the pdf artifact the host embeds
Finished `dev` profile [unoptimized + debuginfo] target(s) in 0.03s
Finished `release` profile [optimized] target(s) in 0.07s
core/pdf/target/wasm32-unknown-unknown/release/slides_pdf.wasm (5301002 bytes)
=== the embedded pdf wasm must match a fresh build
=== rust: test (pdf)
Finished `test` profile [unoptimized + debuginfo] target(s) in 0.03s
Running unittests src/lib.rs (core/pdf/target/debug/deps/slides_pdf-891fafaa44f9fd64)
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Running tests/no_host_imports.rs (core/pdf/target/debug/deps/no_host_imports-17ccbb1d62120093)
running 1 test
test no_host_imports ... ok
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.01s
Running tests/render.rs (core/pdf/target/debug/deps/render-2e1d7e8b19d78595)
running 6 tests
test a_null_zero_length_pair_is_no_frames_not_a_dereference ... ok
test text_with_no_fonts_at_all_still_renders_the_shapes ... ok
test raster_image_is_embedded ... ok
test abi_frames_round_trip ... ok
test renders_text_as_embedded_glyphs ... ok
test two_svgs_make_two_pages ... ok
test result: ok. 6 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.01s
Doc-tests slides_pdf
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
=== fixtures: node dependencies
v24.19.0
11.17.0
=== fixtures: npm ci (needs the registry — see .amadan/README.md)
added 19 packages, and audited 20 packages in 510ms
5 packages are looking for funding
run `npm fund` for details
found 0 vulnerabilities
npm warn allow-scripts 1 package has install scripts not yet covered by allowScripts:
npm warn allow-scripts esbuild@0.28.2 (postinstall: node install.js)
npm warn allow-scripts
npm warn allow-scripts Run `npm approve-scripts --allow-scripts-pending` to review, or `npm approve-scripts <pkg>` to allow.
=== fixtures: the JS side's own tests
✔ one finished upload is register_asset plus the block that uses it, in one batch (10.116054ms)
✔ a record missing its numbers still makes an op the core accepts (0.89538ms)
✔ unusedAssets is what no slide refers to, and remove_asset drops one (2.030976ms)
✔ the Unused images list reconciles by id and names each Remove button (0.836161ms)
✔ an upload refusal is said in words the person can act on (0.170706ms)
✔ clampBox keeps the box inside the frame and no smaller than the minimum (1.632706ms)
✔ fixBox writes four decimals (0.198829ms)
✔ guides are the thirds plus every other block edge (0.213926ms)
✔ snapMove pulls the nearest edge onto a guide within one per cent, and leaves a far one (0.375847ms)
✔ snapResize moves only the edges the handle drags (0.192808ms)
✔ moveBox and resizeBox by handle (0.220659ms)
✔ nudge: arrows move by half a per cent, Shift by two, Alt resizes (0.192487ms)
✔ rectBox reads a block rectangle against its frame (0.222483ms)
✔ typing into a block is a text change on its slide only (8.771461ms)
✔ a block's props changing is structure on its slide (2.086769ms)
✔ adding, moving or removing a block is structure on its slide (2.766569ms)
✔ the notes are text on their slide (2.293872ms)
✔ a slide added, removed or moved is an order change (2.132002ms)
✔ one transaction touching several things reports each once (1.064423ms)
✔ what the ops write passes, and so does an empty document (9.257544ms)
✔ the shapes y-prosemirror and older documents write pass (1.815566ms)
✔ an unknown formatting attribute is reported with the core's message (1.957248ms)
✔ an element inside a paragraph, a non-paragraph child and bare text are reported (2.909003ms)
✔ the unknownmark poison shape is what the check refuses (1.637626ms)
✔ y-prosemirror 1.3.7 deletes the words under an unknown mark; sanitising first keeps them (5.232913ms)
✔ the vocabulary is the five marks and nothing else (0.197456ms)
✔ a reload reuses the id this tab stored for the deck (1.182202ms)
✔ two tabs, and two decks in one tab, get different ids (1.485844ms)
✔ a stored value that is not an id, or storage that throws, gives a fresh id (0.376818ms)
✔ a duplicated tab gives up the copied id; the original keeps it (7.380955ms)
✔ a reload finds no rival and keeps its id (1.674194ms)
✔ presence switches id: beats carry the new one and the old one is somebody else (1.361855ms)
✔ an empty body is no frames (1.543522ms)
✔ frames come back in order with their exact bytes (0.362342ms)
✔ a length prefix is big-endian (0.204609ms)
✔ a truncated frame throws rather than returning a short update (2.656245ms)
✔ deck controls are set_meta (12.551621ms)
✔ slide controls are set_slide, and background keeps its colour (3.643494ms)
✔ move up and down are move_slide with the right after (5.451256ms)
✔ block props: value kinds, region, a shape label (3.167744ms)
✔ box fields are set_block on the desktop and set_phone in the phone view (4.77942ms)
✔ move block and the layer buttons (3.033785ms)
✔ add block: region after the selection on flow, a default box on canvas, a heading level that fits (7.214335ms)
✔ a block is named by its type and its first words (5.70142ms)
✔ blockChange: a control element to its op (2.425147ms)
✔ the Blocks list reconciles by id and keeps its buttons (1.355744ms)
✔ open resolves to the button that closed it and the trimmed field (4.913038ms)
✔ a second open while the dialog is up joins the first (0.251947ms)
✔ a missing dialog mounts as nothing (0.161018ms)
✔ a tab advances its own cursor only when its POST is the very next row (3.010109ms)
✔ the cursor never moves backwards when a response is overtaken by this tab's own write (0.556693ms)
✔ a later response still carries the cursor forward (0.291871ms)
✔ a burst of notifications collapses into one fetch at a time (0.256015ms)
✔ an event naming a seq the tab already has fetches nothing (0.197526ms)
✔ a stopped subscriber drops a response that arrives late (0.37746ms)
✔ stop closes the stream, and start opens exactly one (0.316026ms)
✔ a hidden tab closes its stream on a shortened deadline, and activity reopens it (0.979446ms)
✔ switching away and back inside the grace never drops the stream, so nothing has to be caught up (0.491732ms)
✔ a visible tab that is only being READ closes when idle and comes back on any activity (1.856682ms)
✔ activity while streaming defers the idle close rather than reopening anything (0.305787ms)
✔ a stream failure is never reported as a save failure, and heals on activity (0.274769ms)
✔ an empty response advances the cursor without applying anything (0.374564ms)
✔ a failed fetch leaves the cursor alone so the next notification retries it (0.637341ms)
✔ a decode failure retries once through the raw log, then gives up (1.503939ms)
✔ updatesURL spells the query string exactly, in particular raw as the literal raw=1 (0.150099ms)
✔ empty_doc_views_as_defaults (8.306932ms)
✔ set_meta (3.80336ms)
✔ slides: add, move, remove, set_slide, set_notes (7.568523ms)
✔ duplicate_slide (4.730739ms)
✔ blocks: add, move, remove, set_block (3.573907ms)
✔ set_phone (1.310741ms)
✔ table cells follow rows and cols (1.161323ms)
✔ canvas blocks: box defaults from the region, z from the index (0.840518ms)
✔ assets: register and remove (2.455693ms)
✔ markdown: every mark, code blocks are plain lines (3.736928ms)
✔ batch_is_atomic (2.224293ms)
✔ a batch applies in one transaction with the given origin (0.455715ms)
✔ columns_children_validated (1.896466ms)
✔ layout_switch_round_trip (1.476137ms)
✔ view_matches_snapshot_fixtures (18.07526ms)
✔ columns children have one parent and no cycles (codex 7) (1.098376ms)
✔ canvas-to-flow keeps a concurrent text edit (codex 4) (3.058571ms)
✔ move_block keeps a concurrent text edit, and later inserts land where after says (codex 4) (2.665753ms)
✔ move_slide keeps a concurrent text edit, and later inserts land where after says (codex 4 at slide level) (2.309773ms)
✔ format: {name} and {n} interpolate; an unknown key is left as text (0.923231ms)
✔ a beat on connect, then one every twenty seconds (3.38717ms)
✔ a move posts once, 200ms after the last of a burst, and re-arms the beat (1.81204ms)
✔ a hidden tab stops beating; coming back posts at once (0.444253ms)
✔ applySet leaves this tab out and answers what changed (1.013999ms)
✔ a set with rubbish in it is read for what it does carry (0.398098ms)
✔ initials, and a client id per tab (4.486467ms)
✔ a resync that fails is retried with backoff until it succeeds, without ever running twice at once (1.844761ms)
✔ the browser's online event retries immediately, not just on the next backoff tick (0.294396ms)
✔ reportDivergence before any failure runs the first attempt without a caller ever calling online (1.941369ms)
✔ a permanent 4xx drops its batch instead of retrying it, and does not poison the next edit (84.733944ms)
✔ a network failure or a 5xx is retried, not dropped (60.903081ms)
✔ a 500 is retried the same way a network failure is, never dropped (60.420246ms)
✔ the core-written structure reads as ProseMirror marks (6.469284ms)
✔ a y-prosemirror round trip preserves bold and the link (2.629204ms)
✔ y-prosemirror writes href as the one-key map and marks as {} (0.942427ms)
✔ a plain-string href, written before the map shape, still reads (0.564807ms)
✔ textFragment writes the same shape as writeText (0.510026ms)
✔ safeHref is the server allowlist, and a disallowed href never draws an anchor (0.763366ms)
✔ parseHash splits the slide and the block, and survives a stray % (1.733212ms)
✔ destroy takes the listeners off, and a second mount leaves one of each (0.705568ms)
✔ formatHash is the inverse (1.416066ms)
✔ textBlocks finds the text-bearing blocks and skips the rest (1.34808ms)
✔ mountTarget is the element whose children are the paragraphs (0.189451ms)
✔ paragraphTag keeps the renderer's own markup per type (0.125442ms)
✔ blockFragment finds a block's text by slide and block id (5.493766ms)
✔ notesFragment finds the slide's notes (0.722209ms)
✔ blockIDs and slideIDs are the orders on the stage and the strip (0.762043ms)
✔ cellFragments are a table's cells, row-major (1.106141ms)
✔ a load that fails leaves the stage on the slide it was showing and says so (1.134633ms)
✔ slideAfter is the slide to show once one is gone (0.197376ms)
✔ the queue words map to savestatus states, failed staying failed (1.148579ms)
✔ a dropped batch outranks the queue, for the rest of the session (0.277053ms)
✔ the editor status: the save line and the load error are two lines (0.327848ms)
✔ mountSaveStatus loads estilo's module and mounts it on the line (1.11102ms)
✔ a save-status module that will not load says so and refuses to mount (0.530052ms)
✔ dropTarget: before puts it ahead of the item, after behind it, null means first (0.947236ms)
✔ a drop that leaves the order as it is is no move (0.211683ms)
✔ dropOp is the move_slide (0.844896ms)
✔ labelFor is the slide's first heading, else the numbered fallback (4.273654ms)
✔ flush re-points every dirty thumbnail and relabels it (1.816718ms)
✔ destroy takes the item-menu listener off; a second mount leaves one (0.299565ms)
✔ plan says what to add, drop and where each item goes (0.802007ms)
✔ sync moves only the items out of place and keeps focus (1.013328ms)
✔ desktop view: box and size are the block; hidden and order are always the phone map (1.340575ms)
✔ phone view: everything goes to set_phone, carrying the rest of the map (0.35085ms)
✔ the ops it makes are ones the document takes (8.118923ms)
✔ phoneMap reads only the four keys, and only well-typed (0.147584ms)
✔ the stored view is read defensively (0.25911ms)
✔ linkAt reads the link under the cursor and nothing elsewhere (2.285658ms)
✔ setLink marks the selection (1.86614ms)
✔ setLink on a collapsed cursor inside a link replaces that link (0.584454ms)
✔ setLink with nothing selected and no link does nothing (0.205731ms)
✔ removeLink clears the link under the cursor (0.344839ms)
✔ the keymap binds every documented shortcut (0.196534ms)
✔ Mod-b toggles bold through the keymap (0.481312ms)
✔ setLink refuses an address outside the allowlist and writes nothing (0.511208ms)
✔ the state machine runs choose → sign → put → register → op (3.331868ms)
✔ a file the deck will not take never reaches the network (0.794593ms)
✔ alt text is required before the bytes move, unless the image is decorative (0.401264ms)
✔ a step that fails stops the ones after it and reports its own code (0.666816ms)
✔ a failure that is not ours still becomes an UploadError (0.361611ms)
✔ a second pick while one is in flight is refused, not raced (0.57136ms)
✔ an unreadable size is zero rather than a failure (0.304765ms)
✔ a per-call applyOp wins, so an upload lands on the block it was chosen for (0.31303ms)
✔ checkFile takes exactly the four types (0.44224ms)
✔ sha256Hex is the hex digest of the bytes (10.554638ms)
✔ refusal reads this app's JSON error shape, and survives one that is not (0.375717ms)
✔ malformed fonts are null (3.531416ms)
✔ a malformed background is the theme default (1.420393ms)
✔ a malformed box is null (0.591757ms)
✔ the phone layer keeps only its typed fields, order as a whole number (0.465493ms)
✔ assets are typed or skipped (1.392872ms)
✔ every poison update is deterministic bytes that apply to any deck (7.005699ms)
ℹ tests 158
ℹ suites 0
ℹ pass 158
ℹ fail 0
ℹ cancelled 0
ℹ skipped 0
ℹ todo 0
ℹ duration_ms 296.646092
=== the vectors must match a fresh generation
canvas: 22 ops, 3715 bytes
columns: 23 ops, 3134 bytes
every-block: 36 ops, 3180 bytes
table: 14 ops, 1509 bytes
title-only: 6 ops, 1136 bytes
=== the editor bundle must match a fresh build
wrote internal/slides/static/editor.0463180baf5aab9f.js (376416 bytes)
=== go: vet, gofmt, test, migration check
go vet ./...
go test ./...
? amadan.net/oficina/slides/cmd/slides [no test files]
ok amadan.net/oficina/slides/internal/slides 12.052s
ok amadan.net/oficina/slides/internal/slides/core 2.454s
ok amadan.net/oficina/slides/internal/slides/deck (cached)
ok amadan.net/oficina/slides/internal/slides/fonts (cached)
? amadan.net/oficina/slides/internal/slides/icons [no test files]
? amadan.net/oficina/slides/internal/slides/keymailtest [no test files]
ok amadan.net/oficina/slides/internal/slides/layout (cached)
ok amadan.net/oficina/slides/internal/slides/live (cached)
ok amadan.net/oficina/slides/internal/slides/pdfcore (cached)
ok amadan.net/oficina/slides/internal/slides/present (cached)
ok amadan.net/oficina/slides/internal/slides/render (cached)
ok amadan.net/oficina/slides/internal/slides/svg (cached)
ok amadan.net/oficina/slides/internal/slidestest 37.831s
? amadan.net/oficina/slides/scripts/writeestilo [no test files]
go run amadan.net/rastrillo/rastrillo/cmd/rastrillo migration check
rastrillo migration check: models and migrations agree
python3 scripts/credits.py --check
credits: checked
gate: ok
diff --git a/internal/slides/mailqueue.go b/internal/slides/mailqueue.go| index 1a585c8..d8c23bc 100644 |
| --- a/internal/slides/mailqueue.go |
| +++ b/internal/slides/mailqueue.go |
| @@ -168,6 +168,13 @@ func (q *mailQueue) logf(msg string, args ...any) { |
| // pump is the only goroutine that writes to the logger. It ends when |
| // the worker closes logs on its way out. |
| +// |
| +// Its limit, stated rather than engineered around: a write blocked |
| +// inside the logger (a stalled sink) cannot be interrupted from Go. It |
| +// can only finish, or die with the process. Closing logs does not reach |
| +// it mid-write, so a stalled sink leaves this one goroutine behind |
| +// until the sink moves. Nothing else waits on it: not Send, not the |
| +// worker, not close. |
| func (q *mailQueue) pump() { |
| for l := range q.logs { |
| if n := q.lostLogs.Swap(0); n > 0 { |
| @@ -245,7 +252,9 @@ func (q *mailQueue) wait() { |
| // close stops taking links and drains what is queued, within |
| // drainTimeout; then it cancels, abandons the rest, and stops the |
| -// worker (see the type's comment). |
| +// worker (see the type's comment). It never waits on the log pump: |
| +// shutdown deliberately does not wait for a write blocked inside the |
| +// logger, which can only finish or die with the process (see pump). |
| func (q *mailQueue) close() { |
| q.mu.Lock() |
| if q.closed { |
diff --git a/internal/slides/mailqueue_test.go b/internal/slides/mailqueue_test.go| index 9dcb969..3740fdb 100644 |
| --- a/internal/slides/mailqueue_test.go |
| +++ b/internal/slides/mailqueue_test.go |
| @@ -214,13 +214,28 @@ func mailWorkers() int { |
| } |
| // TestMailQueueCloseIsBoundedWithAStalledLogger: close reports through |
| -// nothing that can block. With the log sink stalled — every write hangs |
| -// — and a relay that never answers but honours cancellation, close |
| -// still returns within its bound and the worker has exited. Once the |
| -// sink is released, the goroutine count is back to its baseline: the |
| -// only thing a stalled sink can hold is the log pump's one write, never |
| -// close or the worker (Astra, round 3, P2). |
| +// nothing that can block, and never waits on the log pump. With the log |
| +// sink stalled — every write hangs — and a relay that never answers but |
| +// honours cancellation, and WHILE THE SINK IS STILL STALLED: |
| +// |
| +// - close returns within its bound; |
| +// - the mail worker has exited; |
| +// - at most the one log pump remains, blocked in its write. |
| +// |
| +// A write blocked inside the logger cannot be interrupted from Go; it |
| +// can only finish or die with the process, and shutdown deliberately |
| +// does not wait for it. So only once the sink is released must the pump |
| +// exit and the goroutine count return to its baseline (Astra on #20, |
| +// rounds 3 and 4). The test fails if close waited on the pump, or if |
| +// the pump could hold the worker. |
| func TestMailQueueCloseIsBoundedWithAStalledLogger(t *testing.T) { |
| + waitFor := func(cond func() bool) bool { |
| + deadline := time.Now().Add(2 * time.Second) |
| + for !cond() && time.Now().Before(deadline) { |
| + time.Sleep(5 * time.Millisecond) |
| + } |
| + return cond() |
| + } |
| baseline := runtime.NumGoroutine() |
| release := make(chan struct{}) |
| var once sync.Once |
| @@ -246,17 +261,23 @@ func TestMailQueueCloseIsBoundedWithAStalledLogger(t *testing.T) { |
| <-closed |
| t.Fatal("close hung on a stalled log sink") |
| } |
| + |
| + // The sink is still stalled. |
| select { |
| case <-q.done: |
| default: |
| t.Fatal("the worker was still running after close, held by the stalled log sink") |
| } |
| - free() |
| - deadline := time.Now().Add(2 * time.Second) |
| - for runtime.NumGoroutine() > baseline && time.Now().Before(deadline) { |
| - time.Sleep(5 * time.Millisecond) |
| + if !waitFor(func() bool { return runtime.NumGoroutine() <= baseline+1 }) { |
| + t.Fatalf("%d goroutines with the sink stalled, %d before: more than the one blocked log pump remains", runtime.NumGoroutine(), baseline) |
| } |
| - if n := runtime.NumGoroutine(); n > baseline { |
| - t.Fatalf("%d goroutines after close and release, %d before", n, baseline) |
| + if n := mailWorkers(); n > 1 { |
| + t.Fatalf("%d mail queue goroutines with the sink stalled, want at most the log pump", n) |
| + } |
| + |
| + // Released, the pump finishes its write and exits. |
| + free() |
| + if !waitFor(func() bool { return mailWorkers() == 0 && runtime.NumGoroutine() <= baseline }) { |
| + t.Fatalf("after release: %d mail queue goroutines, %d goroutines against %d before", mailWorkers(), runtime.NumGoroutine(), baseline) |
| } |
| } |