@automattic/vip 4.1.4 → 4.1.6

package/internal/sqlvalidation/sql_test.go

@@ -1,206 +0,0 @@
-package sqlvalidation
-
-import (
-	"strings"
-	"testing"
-)
-
-// findCheck returns the named check from the Result. Test helper.
-func findCheck(t *testing.T, res *Result, key string) *Check {
-	t.Helper()
-	for _, c := range res.Checks {
-		if c.Key == key {
-			return c
-		}
-	}
-	t.Fatalf("check %q not found", key)
-	return nil
-}
-
-func TestValidateBinaryLogging(t *testing.T) {
-	in := strings.NewReader("SET @@SESSION.sql_log_bin = 1;\n")
-	res, err := Validate(in)
-	if err != nil {
-		t.Fatalf("Validate: %v", err)
-	}
-	c := findCheck(t, res, "binaryLogging")
-	if len(c.Results) != 1 || c.Results[0].Line != 1 {
-		t.Errorf("binaryLogging: got %#v, want [{Line:1}]", c.Results)
-	}
-}
-
-func TestValidateTrigger(t *testing.T) {
-	in := strings.NewReader("CREATE DEFINER=`root`@`localhost` TRIGGER my_trigger BEFORE INSERT\n")
-	res, _ := Validate(in)
-	c := findCheck(t, res, "trigger")
-	if len(c.Results) != 1 || c.Results[0].Line != 1 {
-		t.Errorf("trigger: got %#v", c.Results)
-	}
-}
-
-func TestValidateDropDatabase(t *testing.T) {
-	in := strings.NewReader("DROP DATABASE foo;\n")
-	res, _ := Validate(in)
-	c := findCheck(t, res, "dropDB")
-	if len(c.Results) != 1 || c.Results[0].Line != 1 {
-		t.Errorf("dropDB: got %#v", c.Results)
-	}
-}
-
-func TestValidateAlterUser(t *testing.T) {
-	cases := []string{
-		"ALTER USER 'root'@'localhost' IDENTIFIED BY 'x';\n",
-		"SET PASSWORD FOR 'root'@'localhost' = 'x';\n",
-	}
-	for _, sql := range cases {
-		res, _ := Validate(strings.NewReader(sql))
-		c := findCheck(t, res, "alterUser")
-		if len(c.Results) != 1 {
-			t.Errorf("alterUser %q: got %d results", sql, len(c.Results))
-		}
-	}
-}
-
-func TestValidateDropTable(t *testing.T) {
-	in := strings.NewReader("DROP TABLE IF EXISTS `wp_users`;\n")
-	res, _ := Validate(in)
-	c := findCheck(t, res, "dropTable")
-	if len(c.Results) != 1 || c.Results[0].Text != "wp_users" {
-		t.Errorf("dropTable: got %#v", c.Results)
-	}
-}
-
-func TestValidateCreateTable(t *testing.T) {
-	in := strings.NewReader("CREATE TABLE `wp_users` (id int);\n")
-	res, _ := Validate(in)
-	c := findCheck(t, res, "createTable")
-	if len(c.Results) != 1 || c.Results[0].Text != "wp_users" {
-		t.Errorf("createTable: got %#v", c.Results)
-	}
-	if len(res.TableNames) != 1 || res.TableNames[0] != "wp_users" {
-		t.Errorf("tableNames: got %#v, want [wp_users]", res.TableNames)
-	}
-}
-
-func TestValidateAlterTable(t *testing.T) {
-	in := strings.NewReader("ALTER TABLE `wp_users` ADD COLUMN x INT;\n")
-	res, _ := Validate(in)
-	c := findCheck(t, res, "alterTable")
-	if len(c.Results) != 1 || c.Results[0].Line != 1 {
-		t.Errorf("alterTable: got %#v", c.Results)
-	}
-}
-
-func TestValidateUniqueChecks(t *testing.T) {
-	in := strings.NewReader("SET UNIQUE_CHECKS = 0;\n")
-	res, _ := Validate(in)
-	c := findCheck(t, res, "uniqueChecks")
-	if len(c.Results) != 1 {
-		t.Errorf("uniqueChecks: got %#v", c.Results)
-	}
-}
-
-func TestValidateSiteHomeUrl(t *testing.T) {
-	in := strings.NewReader(`INSERT INTO wp_options VALUES (1,'siteurl','http://example.com');` + "\n")
-	res, _ := Validate(in)
-	c := findCheck(t, res, "siteHomeUrl")
-	if len(c.Results) != 1 || c.Results[0].Text != "siteurl http://example.com" {
-		t.Errorf("siteHomeUrl: got %#v", c.Results)
-	}
-}
-
-func TestValidateEngineInnoDB(t *testing.T) {
-	// Non-InnoDB engine should be flagged.
-	in := strings.NewReader(") ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;\n")
-	res, _ := Validate(in)
-	c := findCheck(t, res, "engineInnoDB")
-	if len(c.Results) != 1 {
-		t.Errorf("engineInnoDB MyISAM: got %d results, want 1", len(c.Results))
-	}
-
-	// InnoDB should NOT be flagged.
-	in = strings.NewReader(") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;\n")
-	res, _ = Validate(in)
-	c = findCheck(t, res, "engineInnoDB")
-	if len(c.Results) != 0 {
-		t.Errorf("engineInnoDB InnoDB: got %d results, want 0", len(c.Results))
-	}
-
-	// Case-insensitive ENGINE=, and an optional space before InnoDB are OK.
-	in = strings.NewReader(") engine= InnoDB DEFAULT CHARSET=utf8mb4;\n")
-	res, _ = Validate(in)
-	c = findCheck(t, res, "engineInnoDB")
-	if len(c.Results) != 0 {
-		t.Errorf("engineInnoDB case-insensitive: got %d results, want 0", len(c.Results))
-	}
-}
-
-func TestValidateAutoIncrement(t *testing.T) {
-	in := strings.NewReader("  `id` bigint(20) NOT NULL AUTO_INCREMENT,\n")
-	res, _ := Validate(in)
-	c := findCheck(t, res, "autoIncrement")
-	if len(c.Results) != 1 || c.Results[0].Text != "NOT NULL AUTO_INCREMENT," {
-		t.Errorf("autoIncrement: got %#v", c.Results)
-	}
-}
-
-func TestValidateMultiSiteDetection(t *testing.T) {
-	in := strings.NewReader("CREATE TABLE wp_2_options (id int);\n")
-	res, _ := Validate(in)
-	if !res.IsMultiSite {
-		t.Errorf("IsMultiSite: got false, want true")
-	}
-}
-
-func TestValidateCleanDump(t *testing.T) {
-	clean := strings.Join([]string{
-		"-- A clean dump.",
-		"DROP TABLE IF EXISTS `wp_options`;",
-		"CREATE TABLE `wp_options` (",
-		"  `option_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,",
-		"  PRIMARY KEY (`option_id`)",
-		") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;",
-		"INSERT INTO `wp_options` VALUES (1, 'siteurl', 'http://example.com');",
-	}, "\n") + "\n"
-	res, err := Validate(strings.NewReader(clean))
-	if err != nil {
-		t.Fatalf("Validate: %v", err)
-	}
-	if res.IsMultiSite {
-		t.Errorf("clean dump flagged multisite")
-	}
-	// dropTable and createTable present; everything else absent.
-	if got := len(findCheck(t, res, "dropTable").Results); got != 1 {
-		t.Errorf("dropTable: got %d, want 1", got)
-	}
-	if got := len(findCheck(t, res, "createTable").Results); got != 1 {
-		t.Errorf("createTable: got %d, want 1", got)
-	}
-	for _, key := range []string{"binaryLogging", "trigger", "dropDB", "alterUser", "alterTable", "uniqueChecks", "engineInnoDB"} {
-		if got := len(findCheck(t, res, key).Results); got != 0 {
-			t.Errorf("%s in clean dump: got %d, want 0", key, got)
-		}
-	}
-}
-
-func TestValidateUseStatementSkipped(t *testing.T) {
-	// useStatement is in DEV_ENV_SPECIFIC_CHECKS and never registered for
-	// validate-sql; a USE statement should not appear in any check's results.
-	in := strings.NewReader("USE my_database;\n")
-	res, _ := Validate(in)
-	for _, c := range res.Checks {
-		if c.Key == "useStatement" {
-			t.Fatalf("useStatement should not be registered for validate-sql")
-		}
-		if len(c.Results) != 0 {
-			t.Errorf("%s flagged USE line: %#v", c.Key, c.Results)
-		}
-	}
-}
-
-func TestValidateFileMissing(t *testing.T) {
-	_, err := ValidateFile("/nonexistent/path/that/should/not/exist.sql")
-	if err == nil {
-		t.Errorf("ValidateFile(missing): got nil, want error")
-	}
-}

package/internal/sync/sync.go

@@ -1,246 +0,0 @@
-// Package sync wraps the SyncEnvironment + SyncProgress genqlient
-// operations behind a Go-friendly surface.
-//
-// The package intentionally collides with stdlib `sync`; callers should
-// import it under an alias (e.g. `syncpkg`).
-//
-// Node parity references: src/bin/vip-sync.js. Notable schema facts
-// discovered while porting:
-//
-//   - AppEnvironmentSyncInput uses Id (not appId) for the application ID.
-//   - AppEnvironmentSyncProgress.sync is Int (the job ID), not String.
-//   - AppEnvironmentSyncStep has three fields — Name, Status, Step —
-//     where Step is the stable identifier (the plan only listed two).
-//
-// The "Site is already syncing" GraphQL error is treated specially:
-// Start returns an AlreadySyncingError sentinel so the handler can
-// proceed to polling without surfacing the message as a fatal error
-// (mirrors Node's CombinedGraphQLErrors check).
-package sync
-
-import (
-	"context"
-	"strings"
-	"time"
-
-	"github.com/Khan/genqlient/graphql"
-
-	"github.com/Automattic/vip/internal/gql"
-)
-
-// AlreadySyncingErrMsg is the exact server error string that signals an
-// in-progress sync. Compared as a substring (not equality) because the
-// transport may wrap the message with location metadata; Node's check
-// uses exact equality against err.message, but matching as substring is
-// strictly more permissive and keeps us robust against minor wrapping.
-const AlreadySyncingErrMsg = "Site is already syncing"
-
-// AlreadySyncingError is returned by Start when the server rejects the
-// mutation because a sync is already underway. Callers detect this with
-// errors.As / errors.Is to switch to the "join the existing run" path.
-type AlreadySyncingError struct{}
-
-func (AlreadySyncingError) Error() string { return AlreadySyncingErrMsg }
-
-// Status constants — string values that come back from the API. These
-// are the only states currently observed in production; "unknown" is a
-// client-side marker for per-step status values not in this list.
-const (
-	StatusRunning = "running"
-	StatusSuccess = "success"
-	StatusFailed  = "failed"
-	StatusPending = "pending"
-)
-
-// Step is the flat per-step view of an in-flight sync.
-type Step struct {
-	Name   string
-	Status string
-	Step   string
-}
-
-// Progress is the overall sync state. Sync is the job ID (Int in the
-// schema, despite the plan calling it String).
-type Progress struct {
-	Status string
-	Sync   int64
-	Steps  []Step
-}
-
-// IsTerminal reports whether the status string is a terminal state
-// (success or failed). Running and pending are not terminal.
-func IsTerminal(status string) bool {
-	return status == StatusSuccess || status == StatusFailed
-}
-
-// Start triggers a sync of the production env into the target env.
-// On "Site is already syncing", returns AlreadySyncingError so the
-// caller can fall through to polling. Other GraphQL errors are
-// returned verbatim.
-//
-// The provided ctx MUST opt out of the error middleware via
-// gql.WithAllowGQLErrors so the middleware does not Exit(1) on the
-// "already syncing" response before this function sees it.
-func Start(ctx context.Context, c graphql.Client, appID, envID int64) error {
-	id := appID
-	envIDLocal := envID
-	input := &gql.AppEnvironmentSyncInput{
-		Id:            id,
-		EnvironmentId: envIDLocal,
-	}
-	_, err := gql.SyncEnvironment(ctx, c, input)
-	if err == nil {
-		return nil
-	}
-	if isAlreadySyncing(err) {
-		return AlreadySyncingError{}
-	}
-	return err
-}
-
-// isAlreadySyncing returns true if the err chain contains the
-// "Site is already syncing" message. genqlient surfaces server errors
-// as a gqlerror.List whose Error() concatenates each .Message; we
-// substring-match instead of poking at the list directly to keep this
-// resilient to genqlient internals.
-func isAlreadySyncing(err error) bool {
-	if err == nil {
-		return false
-	}
-	return strings.Contains(err.Error(), AlreadySyncingErrMsg)
-}
-
-// Status returns the current sync progress for (appID, envID). Returns
-// (nil, nil) when the server response shape is present but lacks a
-// syncProgress block (e.g. immediately after Start fires, before the
-// background job kicks in).
-func Status(ctx context.Context, c graphql.Client, appID, envID int64) (*Progress, error) {
-	resp, err := gql.SyncProgress(ctx, c, appID, envID)
-	if err != nil {
-		return nil, err
-	}
-	if resp == nil || resp.App == nil {
-		return nil, nil
-	}
-	for _, e := range resp.App.Environments {
-		if e == nil {
-			continue
-		}
-		// Defensive: server-side query already filters by envID, but a future
-		// caller (or schema change) might surface multiple envs in the slice.
-		// Match explicitly so we never return a sibling env's progress.
-		// If the server omits id (nullable scalar), accept the first env —
-		// matching pre-filter behavior so test fixtures aren't forced to
-		// echo the id back.
-		if e.Id != nil && *e.Id != envID {
-			continue
-		}
-		if e.SyncProgress == nil {
-			return nil, nil
-		}
-		p := &Progress{}
-		if e.SyncProgress.Status != nil {
-			p.Status = *e.SyncProgress.Status
-		}
-		if e.SyncProgress.Sync != nil {
-			p.Sync = *e.SyncProgress.Sync
-		}
-		for _, s := range e.SyncProgress.Steps {
-			if s == nil {
-				continue
-			}
-			step := Step{}
-			if s.Name != nil {
-				step.Name = *s.Name
-			}
-			if s.Status != nil {
-				step.Status = *s.Status
-			}
-			if s.Step != nil {
-				step.Step = *s.Step
-			}
-			p.Steps = append(p.Steps, step)
-		}
-		return p, nil
-	}
-	return nil, nil
-}
-
-// PollOpts configures the Poll loop.
-type PollOpts struct {
-	// Interval between Status queries. Zero falls back to DefaultInterval.
-	Interval time.Duration
-	// OnTransition, if non-nil, is invoked exactly once per step on each
-	// observed status change (including the first time the step is seen).
-	// The argument is the step's NEW state.
-	OnTransition func(Step)
-	// OnError, if non-nil, is consulted on transient Status errors. Return
-	// true to keep polling (treat as transient), false to abort the loop
-	// with the error.
-	OnError func(error) bool
-}
-
-// DefaultInterval is the production poll cadence. Tests can override via
-// PollOpts.Interval (or, at the handler level, VIP_SYNC_INTERVAL_MS).
-const DefaultInterval = 5 * time.Second
-
-// Poll calls Status on a tick and returns when the sync reaches a
-// terminal state (success or failed), the context is cancelled, or an
-// error is judged fatal by OnError. The first Status call happens
-// immediately (no leading sleep), so callers see step transitions
-// without waiting one full Interval first.
-//
-// Footgun: OnError = func(error) bool { return true } + a context with
-// no deadline = infinite silent retry loop. The handler in vip sync uses
-// that pairing intentionally for Node parity (Node's setInterval ignores
-// poll errors), but it relies on the user being there to hit Ctrl-C.
-// Callers without an interactive user MUST pass a context with a
-// timeout, OR set OnError to a function that returns false after N
-// consecutive failures.
-func Poll(ctx context.Context, c graphql.Client, appID, envID int64, opts PollOpts) (*Progress, error) {
-	interval := opts.Interval
-	if interval <= 0 {
-		interval = DefaultInterval
-	}
-	// Track the last-seen status per step (by Step identifier when
-	// available, else falling back to Name). Allows the loop to fire
-	// OnTransition only on actual change rather than once per tick.
-	seen := map[string]string{}
-
-	keyOf := func(s Step) string {
-		if s.Step != "" {
-			return s.Step
-		}
-		return s.Name
-	}
-
-	for {
-		p, err := Status(ctx, c, appID, envID)
-		if err != nil {
-			if opts.OnError != nil && opts.OnError(err) {
-				// Transient — sleep and retry.
-			} else {
-				return nil, err
-			}
-		} else if p != nil {
-			if opts.OnTransition != nil {
-				for _, s := range p.Steps {
-					k := keyOf(s)
-					if prev, ok := seen[k]; !ok || prev != s.Status {
-						seen[k] = s.Status
-						opts.OnTransition(s)
-					}
-				}
-			}
-			if IsTerminal(p.Status) {
-				return p, nil
-			}
-		}
-
-		select {
-		case <-ctx.Done():
-			return p, ctx.Err()
-		case <-time.After(interval):
-		}
-	}
-}

package/internal/sync/sync_test.go

@@ -1,253 +0,0 @@
-package sync
-
-import (
-	"context"
-	"errors"
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"github.com/Khan/genqlient/graphql"
-)
-
-// syncStub is a per-operation GraphQL fake. Each operation is keyed by
-// the JSON request's operationName; the value is either a static body
-// or a function that returns the body for the i-th hit (0-indexed).
-type syncStub struct {
-	mu          sync.Mutex
-	bodies      map[string]func(int) string
-	hits        map[string]int
-	defaultBody string
-}
-
-func newStub() *syncStub {
-	return &syncStub{
-		bodies:      map[string]func(int) string{},
-		hits:        map[string]int{},
-		defaultBody: `{"data":null}`,
-	}
-}
-
-func (s *syncStub) setStatic(op, body string) {
-	s.bodies[op] = func(int) string { return body }
-}
-
-func (s *syncStub) setSeq(op string, bodies ...string) {
-	s.bodies[op] = func(i int) string {
-		if i >= len(bodies) {
-			return bodies[len(bodies)-1]
-		}
-		return bodies[i]
-	}
-}
-
-func (s *syncStub) start(t *testing.T) (*httptest.Server, graphql.Client) {
-	t.Helper()
-	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		buf := make([]byte, r.ContentLength)
-		_, _ = r.Body.Read(buf)
-		op := extractOp(string(buf))
-
-		s.mu.Lock()
-		fn := s.bodies[op]
-		i := s.hits[op]
-		s.hits[op] = i + 1
-		s.mu.Unlock()
-
-		w.Header().Set("Content-Type", "application/json")
-		if fn == nil {
-			_, _ = w.Write([]byte(s.defaultBody))
-			return
-		}
-		_, _ = w.Write([]byte(fn(i)))
-	}))
-	c := graphql.NewClient(srv.URL+"/graphql", srv.Client())
-	return srv, c
-}
-
-// extractOp finds the operationName value in a JSON GraphQL request
-// body without parsing the whole document. Substring-search is enough
-// for tests.
-func extractOp(body string) string {
-	const key = `"operationName":"`
-	i := strings.Index(body, key)
-	if i < 0 {
-		return ""
-	}
-	rest := body[i+len(key):]
-	j := strings.Index(rest, `"`)
-	if j < 0 {
-		return ""
-	}
-	return rest[:j]
-}
-
-func TestStartHappyPath(t *testing.T) {
-	stub := newStub()
-	stub.setStatic("SyncEnvironment",
-		`{"data":{"syncEnvironment":{"environment":{"id":7}}}}`)
-	srv, c := stub.start(t)
-	defer srv.Close()
-
-	if err := Start(context.Background(), c, 42, 7); err != nil {
-		t.Fatalf("Start: %v", err)
-	}
-}
-
-func TestStartAlreadySyncing(t *testing.T) {
-	stub := newStub()
-	stub.setStatic("SyncEnvironment",
-		`{"data":null,"errors":[{"message":"Site is already syncing"}]}`)
-	srv, c := stub.start(t)
-	defer srv.Close()
-
-	err := Start(context.Background(), c, 42, 7)
-	if err == nil {
-		t.Fatal("expected AlreadySyncingError, got nil")
-	}
-	var ase AlreadySyncingError
-	if !errors.As(err, &ase) {
-		t.Fatalf("err = %v (%T), want AlreadySyncingError", err, err)
-	}
-}
-
-func TestStartOtherErrorPassthrough(t *testing.T) {
-	stub := newStub()
-	stub.setStatic("SyncEnvironment",
-		`{"data":null,"errors":[{"message":"App not found"}]}`)
-	srv, c := stub.start(t)
-	defer srv.Close()
-
-	err := Start(context.Background(), c, 42, 7)
-	if err == nil {
-		t.Fatal("expected error, got nil")
-	}
-	var ase AlreadySyncingError
-	if errors.As(err, &ase) {
-		t.Fatalf("expected non-AlreadySyncingError; got %v", err)
-	}
-	if !strings.Contains(err.Error(), "App not found") {
-		t.Fatalf("err = %v, want substring 'App not found'", err)
-	}
-}
-
-func TestStatusReturnsProgress(t *testing.T) {
-	stub := newStub()
-	stub.setStatic("SyncProgress", `{"data":{"app":{"id":42,"environments":[
-		{"id":7,"syncProgress":{"status":"running","sync":99,"steps":[
-			{"name":"Backup","status":"success","step":"backup"},
-			{"name":"Restore","status":"running","step":"restore"}
-		]}}
-	]}}}`)
-	srv, c := stub.start(t)
-	defer srv.Close()
-
-	p, err := Status(context.Background(), c, 42, 7)
-	if err != nil {
-		t.Fatalf("Status: %v", err)
-	}
-	if p == nil {
-		t.Fatal("Status returned nil progress")
-	}
-	if p.Status != "running" || p.Sync != 99 {
-		t.Errorf("Progress = %+v, want status=running sync=99", p)
-	}
-	if len(p.Steps) != 2 {
-		t.Fatalf("Steps len = %d, want 2", len(p.Steps))
-	}
-	if p.Steps[0].Step != "backup" || p.Steps[1].Status != "running" {
-		t.Errorf("Steps = %+v, want backup/success + restore/running", p.Steps)
-	}
-}
-
-func TestPollTerminatesOnSuccess(t *testing.T) {
-	stub := newStub()
-	// First call: running. Second call: success.
-	stub.setSeq("SyncProgress",
-		`{"data":{"app":{"id":42,"environments":[
-			{"id":7,"syncProgress":{"status":"running","sync":1,"steps":[
-				{"name":"Backup","status":"running","step":"backup"}
-			]}}
-		]}}}`,
-		`{"data":{"app":{"id":42,"environments":[
-			{"id":7,"syncProgress":{"status":"success","sync":1,"steps":[
-				{"name":"Backup","status":"success","step":"backup"}
-			]}}
-		]}}}`,
-	)
-	srv, c := stub.start(t)
-	defer srv.Close()
-
-	var transitions atomic.Int32
-	p, err := Poll(context.Background(), c, 42, 7, PollOpts{
-		Interval: 1 * time.Millisecond,
-		OnTransition: func(s Step) {
-			transitions.Add(1)
-		},
-	})
-	if err != nil {
-		t.Fatalf("Poll: %v", err)
-	}
-	if p == nil || p.Status != StatusSuccess {
-		t.Fatalf("Poll final = %+v, want status=success", p)
-	}
-	if n := transitions.Load(); n < 2 {
-		t.Errorf("transitions = %d, want >= 2 (running then success)", n)
-	}
-}
-
-func TestPollRespectsCancel(t *testing.T) {
-	stub := newStub()
-	// Always running — Poll will never terminate on its own.
-	stub.setStatic("SyncProgress", `{"data":{"app":{"id":42,"environments":[
-		{"id":7,"syncProgress":{"status":"running","sync":1,"steps":[]}}
-	]}}}`)
-	srv, c := stub.start(t)
-	defer srv.Close()
-
-	ctx, cancel := context.WithTimeout(context.Background(), 50*time.Millisecond)
-	defer cancel()
-
-	_, err := Poll(ctx, c, 42, 7, PollOpts{Interval: 5 * time.Millisecond})
-	if err == nil {
-		t.Fatal("Poll should return ctx error on cancel, got nil")
-	}
-	if !errors.Is(err, context.DeadlineExceeded) && !errors.Is(err, context.Canceled) {
-		t.Fatalf("err = %v, want ctx error", err)
-	}
-}
-
-func TestPollOnErrorTransient(t *testing.T) {
-	stub := newStub()
-	// First Status call returns an error; second returns success.
-	stub.setSeq("SyncProgress",
-		`{"data":null,"errors":[{"message":"transient blip"}]}`,
-		`{"data":{"app":{"id":42,"environments":[
-			{"id":7,"syncProgress":{"status":"success","sync":1,"steps":[]}}
-		]}}}`,
-	)
-	srv, c := stub.start(t)
-	defer srv.Close()
-
-	var sawErr atomic.Int32
-	p, err := Poll(context.Background(), c, 42, 7, PollOpts{
-		Interval: 1 * time.Millisecond,
-		OnError: func(e error) bool {
-			sawErr.Add(1)
-			return true // treat as transient
-		},
-	})
-	if err != nil {
-		t.Fatalf("Poll: %v", err)
-	}
-	if p == nil || p.Status != StatusSuccess {
-		t.Fatalf("Poll final = %+v, want status=success", p)
-	}
-	if sawErr.Load() == 0 {
-		t.Errorf("OnError never called; want at least once")
-	}
-}