amadan
gate: the root e2e retry fixture reports the retry protocol its box takes
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
1 file changed,
+5
−3
instances_e2e_test.go+5 −3
diff --git a/instances_e2e_test.go b/instances_e2e_test.go| index dae1ecf85..8a7720e5d 100644 |
| --- a/instances_e2e_test.go |
| +++ b/instances_e2e_test.go |
| @@ -293,7 +293,8 @@ func TestE2EInstancesThroughConsole(t *testing.T) { |
| box := status.CollectBox(nil, status.Probes{MachineID: "e2e-box"}, time.Now()) |
| box.Metrics = &status.BoxMetrics{Rollout: &status.RolloutReport{Hosts: map[string]status.HostRollout{ |
| haHost: {Account: release.OpsAccount, App: "titogo", Installed: "v2", Serving: "v1", Good: "v1", |
| - Awake: true, HeldBy: "v2", HeldEpoch: 9, HeldBook: "e2e-book", Reason: status.ReasonHealth}, |
| + Awake: true, HeldBy: "v2", HeldEpoch: 9, HeldBook: "e2e-book", Reason: status.ReasonHealth, |
| + RetryV: status.HostRetryV}, // the retry protocol this box takes (readiness round 2, Task 3) |
| }}} |
| if err := status.WriteBox(context.Background(), relStore, box); err != nil { |
| t.Fatal(err) |
| @@ -303,9 +304,10 @@ func TestE2EInstancesThroughConsole(t *testing.T) { |
| if want := fmt.Sprintf(instancesRetryDone, haHost, "v2"); !strings.Contains(buf.String(), want) { |
| t.Fatalf("instances retry stdout = %q, want %q", buf.String(), want) |
| } |
| - scopes, found, err := release.LoadRestartScopes(context.Background(), relStore, release.OpsAccount, "titogo") |
| + // Grants ride the app's host-retry log, not restart-scope.json (Task 3). |
| + scopes, found, err := release.LoadHostRetries(context.Background(), relStore, release.OpsAccount, "titogo") |
| if err != nil || !found || len(scopes.Requests) == 0 { |
| - t.Fatalf("restart scopes = %+v, %v, %v", scopes, found, err) |
| + t.Fatalf("host retries = %+v, %v, %v", scopes, found, err) |
| } |
| last := scopes.Requests[len(scopes.Requests)-1] |
| if last.Scope.Kind != release.RestartScopeRetry || last.Scope.Value != haHost { |