Skip to content

test(tide): pin the lgtm gate re-check after an unknown-mergeability retry (evaluateMerge, tide.ts:198-206) #557

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

Open
hivecommons-hive wants to merge 1 commit into
base: main
Choose a base branch
from
+29 −0
Open

test(tide): pin the lgtm gate re-check after an unknown-mergeability retry (evaluateMerge, tide.ts:198-206) #557

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
29 changes: 29 additions & 0 deletions __tests__/plugins/tide.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,35 @@ describe('tryMergePullRequest', () => {
expect(info).toHaveBeenCalledWith('skipping pr #1: not mergeable (unknown)')
})

// the gate is re-read with the state: an lgtm that disappears while the state is still
// unknown ends the wait at that read, before the remaining 2 s and 4 s retries
it('stops retrying an unknown state once the lgtm label disappears on the re-read', async () => {
const gets = servePull(pull(['lgtm'], unknown), pull([], unknown))
const merge = observeMerge()
const info = vi.spyOn(core, 'info')

await expect(tryMergePullRequest(octokit, context, 1, tide)).resolves.toBe('skipped')
await expect(merge.notCalled()).resolves.toBe('not called')
expect(gets).toHaveLength(2)
expect(sleep).toHaveBeenCalledExactlyOnceWith(1000)
expect(info).toHaveBeenCalledWith('skipping pr #1: missing lgtm')
expect(info).not.toHaveBeenCalledWith('mergeability of pr #1 is still unknown after 3 retries')
})

// the first read passed the gate, but the merge decision is made on the re-read: a state that
// becomes clean at the same moment the lgtm label is removed must not merge
it('does not merge when the re-read turns clean but has lost the lgtm label', async () => {
const gets = servePull(pull(['lgtm'], unknown), pull([]))
const merge = observeMerge()
const info = vi.spyOn(core, 'info')

await expect(tryMergePullRequest(octokit, context, 1, tide)).resolves.toBe('skipped')
await expect(merge.notCalled()).resolves.toBe('not called')
expect(gets).toHaveLength(2)
expect(sleep).toHaveBeenCalledExactlyOnceWith(1000)
expect(info).toHaveBeenCalledWith('skipping pr #1: missing lgtm')
})

it.each([
[['kind/bug'], 'missing lgtm'],
[['lgtm', 'do-not-merge/hold'], 'blocked by do-not-merge/hold'],
Expand Down
Loading