Skip to content

[autobackport: sssd-2-9] ci: Fix duplicated python-system-tests in static-code-analysis.yml - #9177

Merged
jakub-vavra-cz merged 1 commit into
SSSD:sssd-2-9from
sssd-bot:SSSD-sssd-backport-pr9169-to-sssd-2-9
Sep 3, 2026
Merged

jakub-vavra-cz merged 1 commit into
SSSD:sssd-2-9from
sssd-bot:SSSD-sssd-backport-pr9169-to-sssd-2-9

Conversation

@sssd-bot

Copy link
Copy Markdown
Contributor

This is an automatic backport of PR#9169 ci: Fix duplicated python-system-tests in static-code-analysis.yml to branch sssd-2-9, created by @jakub-vavra-cz.

Caution

@jakub-vavra-cz 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-pr9169-to-sssd-2-9
git checkout SSSD-sssd-backport-pr9169-to-sssd-2-9
git push sssd-bot SSSD-sssd-backport-pr9169-to-sssd-2-9 --force

Original commits
16a3381 - ci: Fix duplicated python-system-tests in static-code-analysis
d052df0 - tests: Fix E713 [*] Test for membership should be not in

Backported commits

  • e65b3cb - ci: Fix duplicated python-system-tests in static-code-analysis
  • 2310564 - CONFLICT! tests: Fix E713 [*] Test for membership should be not in

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

  • CONFLICT! tests: Fix E713 [*] Test for membership should be not in
On branch SSSD-sssd-backport-pr9169-to-sssd-2-9
You are currently cherry-picking commit d052df099.
  (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_passkey.py

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

Original Pull Request Body

The item got duplicated due to incorrect conflict resolution during rebase.
Set max-line-length for ruff as it has the setting in multiple places.
Fix E713 [*] Test for membership should be not in in passkey tests.

The item got duplicated due to incorrect conflict resolution during
rebase.
Set max-line-length for ruff as it has the setting in multiple places.

Reviewed-by: Scott Poore <spoore@redhat.com>
(cherry picked from commit 16a3381)
Comment thread src/tests/system/tests/test_passkey.py Fixed
@jakub-vavra-cz
jakub-vavra-cz force-pushed the SSSD-sssd-backport-pr9169-to-sssd-2-9 branch from 2310564 to e65b3cb Compare August 31, 2026 12:41
@jakub-vavra-cz
jakub-vavra-cz marked this pull request as ready for review August 31, 2026 12:42
@jakub-vavra-cz jakub-vavra-cz added Waiting for review Trivial A single reviewer is sufficient to review the Pull Request labels Aug 31, 2026

@spoore1 spoore1 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM. The remaining make-distcheck failure should be fixed by
#9185 and #9092 when it is backported to sssd-2-9.

@jakub-vavra-cz
jakub-vavra-cz merged commit e4ca855 into SSSD:sssd-2-9 Sep 3, 2026
12 of 14 checks passed
@sssd-bot

sssd-bot commented Sep 3, 2026

Copy link
Copy Markdown
Contributor Author

The pull request was accepted by @jakub-vavra-cz with the following PR CI status:


🟢 CodeQL (success)
🟢 rpm-build:centos-stream-9-x86_64:upstream (success)
🟢 testing-farm:centos-stream-9-x86_64:upstream (success)
🔴 Build / make-distcheck (failure)
🟢 Static code analysis / codeql (success)
🟢 Static code analysis / files-changed (success)
🟢 Static code analysis / pre-commit (success)
🟢 Static code analysis / python-system-tests (success)


There are unsuccessful or unfinished checks. Make sure that the failures are not related to this pull request before merging.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Accepted Trivial A single reviewer is sufficient to review the Pull Request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants