Backport: Blame: fix some issues with the stream (#63865)#63929
Conversation
Contributes to SRCH-738 Notably, this does not yet identify the root cause of SRCH-738, but it does identify and fix some confounding bugs. It's possible that these actually also _cause_ some of the issues in SRCH-738, but I wanted to at least push these to dotcom, where we can reproduce some of the weirdness. At the very least, it doesn't explain the auth errors being reported. (cherry picked from commit d91fab3)
| // Test needs more time to teardown | ||
| test.setTimeout(testInfo.timeout * 3000) | ||
| test('file popover', async ({ page, sg }) => { | ||
| test.slow() |
There was a problem hiding this comment.
Unrelated conflict resolution
|
@craigfurman @DaedalusG This PR now contains tests fixes from main and is ready to merge. Let me know if there's anything I need to do to have it merged. |
|
@bahrmichael you should be able to merge it now that its approved. If that's not the case, please ping here again and we can merge it 🙂 @DaedalusG I'm a bit lost after recent release/backport changes, do the release team actually have to approve backports into release branches? https://www.notion.so/sourcegraph/Sourcegraph-Backport-Tool-211d005248bb4b588b4fe8401381e71c implies no - developers can approve backport PRs made by the bot themselves and merge them, according to that. Manual cherry-picks like this of course need to be reviewed by any other org member, because that's just how github works, but AFAIK it doesn't have to be the release team. Holler if I'm wrong! Zooming out, it doesn't make sense IMO for the release team to review all backports - to do so would imply we have reviewer-level context on every change in the company - but this comment is a question about the process today rather than one about how we might want to change it. |
@craigfurman GitHub doesn't allow me to merge, because "The base branch restricts merging to authorized users." Can you hit the button? |
|
Sorry for the delay @bahrmichael, TIL that is the shape of the merge protection rule. Ironically I can't see it, not being a repo admin 😂 |
Contributes to SRCH-738
Notably, this does not yet identify the root cause of SRCH-738, but it does identify and fix some confounding bugs. It's possible that these actually also cause some of the issues in SRCH-738, but I wanted to at least push these to dotcom, where we can reproduce some of the weirdness. At the very least, it doesn't explain the auth errors being reported.
(cherry picked from commit d91fab3)
Test plan
CI