65dcc573 (ggbdpq's patch 1) warmed the bun on PATH before the root
package's one-minute plugin contexts. The same lookup of the bun on PATH
is in 40 more places in internal/provider (28), internal/gateway (8),
internal/plugin (3) and internal/gui (1), and in the root package's
TestPluginListSaysClash. Many of them then open a one- or two-minute
context (internal/provider's sign-in, fetch and move tests,
internal/plugin's sandbox), and there macOS's first-exec check of a
just-installed or upgraded bun landed inside the deadline. The rest
are covered the same way, so no test has to remember which is which.
testenv.Bun now does what the root package's pathBun did: it finds the
bun on PATH (skipping the test when there is none) and runs
`bun --version` before the test opens its context, once per bun per test
binary. pathBun is gone; every `exec.LookPath("bun")` + skip block in
the tests uses testenv.Bun instead. Three tests reach for the bun some
other way and are left as they were: TestHostRunsAsMagpieBun (7ddea2c2
covers its copy), the plugin_git test's realBun and netproxy's
TestBunThroughBridge, none of which runs the plugin host under a
deadline on the PATH bun. migrate_test.go needed two `err` declarations
that the removed block used to provide.
What was run (macOS arm64, bun 1.4.2), with a wrapper bun first on PATH
whose first exec sleeps 61s (marker-gated, then execs the real bun):
- Red, old code:
- internal/provider TestPluginSignInTakesAPastedCallback: FAIL at
61.1s, "pluginsignin_paste_test.go:36: starting plugins: context
deadline exceeded".
- internal/plugin TestFakePlugin: FAIL at 62.0s, "plugin_test.go:66:
Plugins = [], starting plugins: context deadline exceeded".
- internal/gateway TestPluginFailover passed on the old code too (its
calls have no deadline that short), so the gateway is not shown red.
- Green, this change, same cold wrapper: the three tests passed (61.1s,
62.9s, 61.2s).
- go test -tags nogui -count=1 for the root package and for
internal/testenv, gateway, gui, plugin and provider, under a temp HOME
with GOMODCACHE, GOCACHE and GOPATH pinned: all ok.
- gofmt -l on the changed files: clean. go vet of those packages for
darwin (-tags nogui), GOOS=linux and GOOS=windows (-tags nogui), and
GOOS=windows without the tag: clean.
Not run: a really cold bun on a loaded machine; the sleep stands in for
the check. Not run on Linux or Windows, where the warm-up is one extra
`bun --version` per test binary.
TestAccountsOfAPlugin and the plugin login tests (fakeCoHome) point
MAGPIE_BUN at the bun found on PATH and do all their plugin work inside
a one-minute context. 7ddea2c2 kept macOS's first-exec check of the
copied magpie-bun out of that minute, but not the PATH bun's own: when
bun was just installed or upgraded, its check landed inside the minute
and the test failed with "starting plugins: context deadline exceeded".
Both now take their bun from pathBun, which looks it up as before and
runs `bun --version` once before the context opens. This is patch 1 from
ggbdpq's comment on #1306, with the warm-up in one helper beside
fakeCoHome instead of copied into both tests. Patch 2 (quota_served's
stand-ins) is left out: it only saves wall-clock time, and that test has
no deadline.
What was run (macOS arm64, bun 1.4.2):
- Red, old code: a wrapper bun first on PATH whose first exec sleeps
61s (marker-gated, then execs the real bun). TestAccountsOfAPlugin:
FAIL at 62.0s, "accounts_plugin_cli_test.go:38: starting plugins:
context deadline exceeded". TestPluginLoginTakesTheLapseOff: FAIL at
62.0s, "plugin_login_cli_test.go:46: starting plugins: context
deadline exceeded".
- Green, this change, the same cold wrapper with a fresh marker:
TestAccountsOfAPlugin PASS (65.2s), TestPluginLoginTakesTheLapseOff
PASS (63.4s); the 61s is spent before the context opens.
- go test -tags nogui -count=1 . under a temp HOME with GOMODCACHE,
GOCACHE and GOPATH pinned: ok (22.8s); with a warm bun the warm-up
adds nothing noticeable.
- gofmt -l on both files: clean. go vet -tags nogui . for darwin,
GOOS=linux and GOOS=windows: clean.
Not covered: the same shape (LookPath("bun") as MAGPIE_BUN, then a
one-minute context) is in internal/provider (pluginsignin_paste_test,
plugin_fetch_lapse_test, signin_removed_test) and internal/plugin
(plugin_test). Not run on a genuinely cold bun on a loaded machine; the
sleep stands in for the check.
yetone