Tests for #131 #151

andriinikitin · 2026-03-02T17:06:51+01:00

andriinikitin commented

2026-03-02 17:06:51 +01:00

integration tests for #131 - cherry-pick the commit with the tests or merge this

andriinikitin added 5 commits 2026-03-02 17:06:52 +01:00

pr: add merge modes documentation and config parsing b514f9784c

pr: add function that checks and prepares PRs 10f74f681d

pr: No need to try to merge changes ef5db8ca28

We can reset current worktree and clobber it with the merged changes.
We want to emulate `git merge -s theirs` strategy while
`git merge -Xtheirs` only picks `theirs` in case of conflicts.
So, resetting the changes and reading exact is sufficient

`git read-tree -u` updates the current work tree so we do not have
unstaged changes.

rabbitmq: dial with timeout 3a0445e857

Hardcoded 10 second timeout on no connection instead of waiting
forever.

t: merge mode with content conflicts

go-generate-check / go-generate-check (pull_request) Successful in 11s

Details

Integration tests / t (pull_request) Successful in 9m34s

Details

af2d4094be

- Add TC-MERGE- 008, 009, 010, t011 for testing MergeMode of weokflow-pr
- Synchronize integration/test-plan.md with the actual test implementations

andriinikitin force-pushed t-mergemodes from af2d4094be to 97dce5b407

2026-03-03 10:28:17 +01:00

Compare

andriinikitin force-pushed t-mergemodes from 97dce5b407 to 96a908d0be

2026-03-03 13:03:51 +01:00

Compare

adamm approved these changes 2026-03-03 17:28:28 +01:00

adamm manually merged commit e5e1b5d9a5 into main

2026-03-03 17:29:25 +01:00

michals commented

2026-03-03 17:35:37 +01:00

First-time contributor

How can the merge mode of a project be detected?

eg. if I have openSUSE:Backports:SLE-16.1 what is the merge mode?

How can the merge mode of a project be detected? eg. if I have openSUSE:Backports:SLE-16.1 what is the merge mode?

andriinikitin commented

2026-03-04 10:30:17 +01:00

it is parameter in workflow.config so atm one should use the scmsync link and check the config on the referenced repo. E.g. in the tests it was defined like this:

{
    "Workflows": [
        "pr"
    ],
    "Organization": "mypool",
    ...
    "MergeMode": "replace"
}

it is parameter in workflow.config so atm one should use the scmsync link and check the config on the referenced repo. E.g. in the tests it was defined like this: ``` { "Workflows": [ "pr" ], "Organization": "mypool", ... "MergeMode": "replace" } ```

Sign in to join this conversation.

3 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: git-workflow/autogits#151