Skip to content

[autobackport: sssd-2-11] updated kcm flaky test #8515

Open
sssd-bot wants to merge 1 commit intoSSSD:sssd-2-11from
sssd-bot:SSSD-sssd-backport-pr8508-to-sssd-2-11
Open

[autobackport: sssd-2-11] updated kcm flaky test #8515
sssd-bot wants to merge 1 commit intoSSSD:sssd-2-11from
sssd-bot:SSSD-sssd-backport-pr8508-to-sssd-2-11

Conversation

@sssd-bot
Copy link
Contributor

This is an automatic backport of PR#8508 updated kcm flaky test to branch sssd-2-11, created by @danlavu.

Caution

@danlavu The patches did not apply cleanly. It is necessary to resolve conflicts before merging this pull request. Commits that introduced conflict are marked with CONFLICT!.

You can push changes to this pull request

git remote add sssd-bot git@github.com:sssd-bot/sssd.git
git fetch sssd-bot refs/heads/SSSD-sssd-backport-pr8508-to-sssd-2-11
git checkout SSSD-sssd-backport-pr8508-to-sssd-2-11
git push sssd-bot SSSD-sssd-backport-pr8508-to-sssd-2-11 --force

Original commits
77fc6ff - updated kcm flaky test

Backported commits

  • 5dd2c0e - CONFLICT! updated kcm flaky test

Conflicting Files Information (check for deleted and re-added files)

  • CONFLICT! updated kcm flaky test
On branch SSSD-sssd-backport-pr8508-to-sssd-2-11
You are currently cherry-picking commit 77fc6ff1d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/tests/system/tests/test_kcm.py

no changes added to commit (use "git add" and/or "git commit -a")

Original Pull Request Body

Copy link

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request is an automatic backport intended to fix a flaky test. However, the process resulted in a merge conflict within src/tests/system/tests/test_kcm.py. The file now contains unresolved conflict markers, which is a critical issue that breaks the code and must be resolved before this pull request can be merged.

Reviewed-by: Scott Poore <spoore@redhat.com>
(cherry picked from commit 77fc6ff)
@danlavu danlavu force-pushed the SSSD-sssd-backport-pr8508-to-sssd-2-11 branch from 5dd2c0e to 2fb92e5 Compare March 14, 2026 03:35
@danlavu danlavu marked this pull request as ready for review March 14, 2026 03:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants