Skip to content

test(e2e): bump resume checkpoint-advance timeout to 60s for CI flakiness #1902

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

Closed
gtrrz-victor wants to merge 1 commit into from
Closed

test(e2e): bump resume checkpoint-advance timeout to 60s for CI flakiness #1902

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
8 changes: 6 additions & 2 deletions e2e/tests/resume_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,11 @@ func TestResumeSquashMergeMultipleCheckpoints(t *testing.T) {

s.Git(t, "add", ".")
s.Git(t, "commit", "-m", "Add red doc")
testutil.WaitForCheckpoint(t, s, 30*time.Second)
// The second checkpoint condenses onto the single git-branch v1 branch,
// whose advance can lag on a loaded CI runner. 30s flaked here
// intermittently (only on the git-branch backend); give it 60s. See #787
// for the same CI-slower-than-local timing class.
Comment on lines +89 to +92
testutil.WaitForCheckpoint(t, s, 60*time.Second)
cp1Ref := testutil.CurrentCheckpointRef(t, s.Dir)

_, err = s.RunPrompt(t, ctx,
Expand All @@ -97,7 +101,7 @@ func TestResumeSquashMergeMultipleCheckpoints(t *testing.T) {

s.Git(t, "add", ".")
s.Git(t, "commit", "-m", "Add blue doc")
testutil.WaitForCheckpointAdvanceFrom(t, s.Dir, cp1Ref, 30*time.Second)
testutil.WaitForCheckpointAdvanceFrom(t, s.Dir, cp1Ref, 60*time.Second)

// Record checkpoint IDs from both feature branch commits.
cpID1 := testutil.GetCheckpointTrailer(t, s.Dir, "HEAD~1")
Expand Down
Loading