Skip to content

test: fix TestSessionHold_SurvivesRunnerPodDeleteAndRecreate conflict flake #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
josephschorr merged 1 commit into from
Sep 28, 2026
Merged

test: fix TestSessionHold_SurvivesRunnerPodDeleteAndRecreate conflict flake #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions test/e2e/sessionhold_restart_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/util/retry"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/authzed/openagentprimitives/pkg/agent/llm"
Expand Down Expand Up @@ -93,13 +94,23 @@ func createManualHold(t *testing.T, h *e2e.Harness, ns, name, holdName string) {
// not a route into reconcile at all).
func touchSession(t *testing.T, h *e2e.Harness, ns, name string) {
t.Helper()
var sess spiceboxv1alpha1.AgentSession
require.NoError(t, h.K8s.Get(context.Background(), client.ObjectKey{Namespace: ns, Name: name}, &sess))
if sess.Annotations == nil {
sess.Annotations = map[string]string{}
}
sess.Annotations["e2e-restart-test/touch"] = time.Now().Format(time.RFC3339Nano)
require.NoError(t, h.K8s.Update(context.Background(), &sess))
// Get + mutate + Update is wrapped in RetryOnConflict: this touch exists
// precisely to provoke the AgentSession reconciler, which is concurrently
// writing the same object's status (the hold reap bumps resourceVersion),
// so an unretried Update races that write and fails with a spurious
// optimistic-concurrency conflict — same reason harness.go wraps its own
// read-modify-write.
require.NoError(t, retry.RetryOnConflict(retry.DefaultRetry, func() error {
var sess spiceboxv1alpha1.AgentSession
if err := h.K8s.Get(context.Background(), client.ObjectKey{Namespace: ns, Name: name}, &sess); err != nil {
return err
}
if sess.Annotations == nil {
sess.Annotations = map[string]string{}
}
sess.Annotations["e2e-restart-test/touch"] = time.Now().Format(time.RFC3339Nano)
return h.K8s.Update(context.Background(), &sess)
}))
// Give the watch-triggered reconcile a moment to actually run before the
// caller inspects anything.
time.Sleep(200 * time.Millisecond)
Expand Down
Loading