yetone
2da8fbe488
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 (7ddea2c2covers 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.
107 lines
3.2 KiB
Go
107 lines
3.2 KiB
Go
package provider
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"os"
|
|
"path/filepath"
|
|
"sync/atomic"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/yetone/magpie/internal/plugin"
|
|
"github.com/yetone/magpie/internal/testenv"
|
|
)
|
|
|
|
// A plugin's account listed with the plugin's providers is not asked for
|
|
// its list again by FetchNew, as a built-in account fetched once isn't:
|
|
// the Providers page built its state through FetchNew, and every ten
|
|
// minutes asked every plugin's vendors for their lists again.
|
|
func TestFetchNewLeavesListedPlugins(t *testing.T) {
|
|
bun := testenv.Bun(t)
|
|
claudeHome(t)
|
|
t.Setenv("MAGPIE_BUN", bun)
|
|
t.Cleanup(plugin.Settle)
|
|
ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
|
|
defer cancel()
|
|
abs, _ := filepath.Abs("../plugin/testdata/fake/index.js")
|
|
if _, err := plugin.Add(ctx, abs); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if _, err := PluginAPIKey(ctx, "fakeco", 0, nil, "k-123456"); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if _, err := plugin.Providers(ctx); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if p, err := Find("fakeco"); err != nil || !p.IsPlugin() || !p.Ready() {
|
|
t.Fatalf("Find(fakeco) = %+v, %v", p, err)
|
|
}
|
|
// signing in kicked off a refresh of the plugins' providers in the
|
|
// background (Cached, after the auth event); one still running
|
|
// rewrites the list below and reads as FetchNew asking again
|
|
plugin.Refreshed()
|
|
was := newFetchRetry
|
|
newFetchRetry = 0
|
|
t.Cleanup(func() { newFetchRetry = was })
|
|
listed := filepath.Join(filepath.Dir(plugin.AuthPath()), "plugin-providers.json")
|
|
old := time.Now().Add(-time.Hour).Truncate(time.Second)
|
|
if err := os.Chtimes(listed, old, old); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
FetchNew(20 * time.Second)
|
|
if st, err := os.Stat(listed); err != nil || !st.ModTime().Equal(old) {
|
|
t.Fatalf("the plugins were asked for their lists again: %v %v", st.ModTime(), err)
|
|
}
|
|
}
|
|
|
|
// A plugin's usage asked for by the provider's id (the Usage page) and as
|
|
// plugin:<id> (routing) is read from the vendor once, as a built-in's,
|
|
// asked for by one name, is.
|
|
func TestPluginUsageReadOnceWhicheverName(t *testing.T) {
|
|
bun := testenv.Bun(t)
|
|
claudeHome(t)
|
|
t.Setenv("MAGPIE_BUN", bun)
|
|
t.Cleanup(plugin.Settle)
|
|
var asked atomic.Int32
|
|
vendor := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
asked.Add(1)
|
|
fmt.Fprint(w, "Fake Max")
|
|
}))
|
|
defer vendor.Close()
|
|
t.Setenv("FAKE_USAGE", vendor.URL)
|
|
clear := func() {
|
|
loginUsageCache.Lock()
|
|
loginUsageCache.m = nil
|
|
loginUsageCache.Unlock()
|
|
}
|
|
clear()
|
|
t.Cleanup(clear)
|
|
ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
|
|
defer cancel()
|
|
abs, _ := filepath.Abs("../plugin/testdata/fake/index.js")
|
|
if _, err := plugin.Add(ctx, abs); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if _, err := plugin.Providers(ctx); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
st, err := StartPluginSignIn("fakeco", 1, map[string]string{"where": "work", "team": "a"})
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if err := SubmitSignInCallback(st.ID, "good"); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
for _, agent := range []string{"fakeco", "plugin:fakeco"} {
|
|
if q := LoginUsage(ctx, agent)["a@fake"]; q.Plan != "Fake Max" {
|
|
t.Fatalf("%s: %+v", agent, q)
|
|
}
|
|
}
|
|
if n := asked.Load(); n != 1 {
|
|
t.Fatalf("the vendor was asked %d times", n)
|
|
}
|
|
}
|