chadtmiller.com/knotless
git that lives in your Atmosphere account
1
10
The e2e merge flow waits as long for the merge as compacting does
Merged Approved
This raises one e2e expectation's timeout to 30 seconds, as the compacting flow already does. It is consistent with the evidence in the body: the page reached the merged state, only late. The change is small and the comment explains it. The next expectation after it (the Revert button) still uses the default 15 seconds, but it only runs once the merged text is visible, so that should be fine.
All checks have passed
9 passed, 1 skipped
Merged as ecfd8b9
What changes
The e2e flow
merging a pullwaits up to 30 seconds, not the default 15, for the thread to sayMerged as <sha>after Merge pull is clicked, ascompacting a repositoryalready does for its own writes.Why
It failed on Release 0.12.0, a version bump that changes no code, minutes after the same flow passed on main at 935592de. Its picture, taken as the expectation gave up, shows the thread saying
Merged as 64a0db2with Revert beside it: the page got there, only later than 15 seconds. That run's server logged page loads taking over 3 seconds each while it went, and a merge is several PDS writes and then the page asking its answers again.How it was checked
Left to the
e2echeck: the change is one expectation's timeout.Shortcomings
A merge that never says so still fails, 15 seconds later than before.