git-workflow/autogits
SHA256
22
2
Fork 15
Code Issues 44 Pull Requests 15 Actions Projects 2 Activity

t: add manual merge test and improve robustness #149

Manually merged
adamm merged 3 commits from t-manual-merge-and-robustness into main 2026-02-27 15:51:49 +01:00
Conversation 1 Commits 3 Files Changed 18 +527 -301
andriinikitin commented 2026-02-27 02:36:24 +01:00
Member
Copy Link
  • Add TC-MERGE-002: new end-to-end test for ManualMergeOnly functionality.
  • Implement global object tracking in conftest.py to prevent redundant setup.
  • Update test-plan.md to reflect current test implementation and skip statuses.
  • Improve review tests robustness by using unique filenames and better assertions.
  • Configure SLFO staging-main and manual-merge branches for monitored tests.
  • Move flaky NoProjectGitPR tests from xfail to skip.
  • Rename Gitea objects to avoid accidental collision with real repos.
- Add TC-MERGE-002: new end-to-end test for ManualMergeOnly functionality. - Implement global object tracking in conftest.py to prevent redundant setup. - Update test-plan.md to reflect current test implementation and skip statuses. - Improve review tests robustness by using unique filenames and better assertions. - Configure SLFO staging-main and manual-merge branches for monitored tests. - Move flaky NoProjectGitPR tests from xfail to skip. - Rename Gitea objects to avoid accidental collision with real repos.
andriinikitin added 2 commits 2026-02-27 02:36:24 +01:00
common: check for old pending request reviews af2ff0bdd2 
Timeline events will contain Reviews and ReviewRequests and
ReviewDismissed events. We need to handle this at event parsing
time and not to punt this to the query functions later on.

If the last event is an actual review, we use this.
If no review, check if last event associated with the reviewer
is Dismissed or Requested Review but not if a dismissed Review
preceeds it.
t: add manual merge test and improve robustness
All checks were successful
go-generate-check / go-generate-check (pull_request) Successful in 26s
Details
Integration tests / t (pull_request) Successful in 4m35s
Details
4691747038 
- Add TC-MERGE-002: new end-to-end test for ManualMergeOnly functionality.
- Implement global object tracking in conftest.py to prevent redundant setup.
- Update test-plan.md to reflect current test implementation and skip statuses.
- Improve review tests robustness by using unique filenames and better assertions.
- Configure SLFO staging-main and manual-merge branches for monitored tests.
- Move flaky NoProjectGitPR tests from xfail to skip.
adamm approved these changes 2026-02-27 09:23:14 +01:00
adamm left a comment
Owner
Copy Link

We could change the usage of real project names here to something else. So, instead of products/SLFO we could use TestOrg/TestProject and instead of pool maybe PackageOrg.

The reason is to prevent some crazy accident. Imagine someone or something running this code on production server and they have permission. It also then tests that we are not hardcoding some behaviour anywhere.

But overall, I approve "improve robustness" 😆

We could change the usage of real project names here to something else. So, instead of `products/SLFO` we could use `TestOrg/TestProject` and instead of `pool` maybe `PackageOrg`. The reason is to prevent some crazy accident. Imagine someone or something running this code on production server and they have permission. It also then tests that we are not hardcoding some behaviour anywhere. But overall, I approve "improve robustness" 😆
andriinikitin added 1 commit 2026-02-27 13:22:41 +01:00
t: rename Gitea objects to avoid accidental collision with real repos
All checks were successful
go-generate-check / go-generate-check (pull_request) Successful in 8s
Details
Integration tests / t (pull_request) Successful in 4m38s
Details
7832ef90c0 
Also address potential race condition between requested reviews and sending approvals in TC-MERGE-002
adamm manually merged commit 88aa8c32fd into main 2026-02-27 15:51:49 +01:00
Sign in to join this conversation.
Reviewers
No Reviewers
adamm
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
M0ses adamm adamm_super adrianSuSE andriinikitin atartamo bigironman dancermak darix dirkmueller dmach eroca jdsn jzerebecki mstrigl oertel smithfarm
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: git-workflow/autogits#149
Delete Branch "t-manual-merge-and-robustness"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?