Skip to content

[autobackport: sssd-2-9] tests: add test_pac_responder.py#8206

Merged
alexey-tikhonov merged 2 commits intoSSSD:sssd-2-9from
sssd-bot:SSSD-sssd-backport-pr8151-to-sssd-2-9
Nov 19, 2025
Merged

[autobackport: sssd-2-9] tests: add test_pac_responder.py#8206
alexey-tikhonov merged 2 commits intoSSSD:sssd-2-9from
sssd-bot:SSSD-sssd-backport-pr8151-to-sssd-2-9

Conversation

@sssd-bot
Copy link
Contributor

@sssd-bot sssd-bot commented Nov 18, 2025

This is an automatic backport of PR#8151 tests: add test_pac_responder.py to branch sssd-2-9, created by @sumit-bose.

Caution

@sumit-bose 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-pr8151-to-sssd-2-9
git checkout SSSD-sssd-backport-pr8151-to-sssd-2-9
git push sssd-bot SSSD-sssd-backport-pr8151-to-sssd-2-9 --force

Original commits
c78855c - tests: add test_pac_responder.py
be020a3 - intg: remove test_pac_responder.py

Backported commits

  • d9bbd5a - tests: add test_pac_responder.py
  • 3104478 - CONFLICT! intg: remove test_pac_responder.py

Original Pull Request Body

This new system test is a replacment of the integration test with the
same name. It depends on a test binary which was added to the SSSD CI
containers in SSSD/sssd-ci-containers#150.

@sumit-bose sumit-bose force-pushed the SSSD-sssd-backport-pr8151-to-sssd-2-9 branch from 3104478 to ee10e6a Compare November 18, 2025 16:06
@alexey-tikhonov alexey-tikhonov marked this pull request as ready for review November 18, 2025 16:11
@alexey-tikhonov alexey-tikhonov mentioned this pull request Nov 18, 2025
Closed
@alexey-tikhonov
Copy link
Member

alexey-tikhonov commented Nov 18, 2025

@sumit-bose, @pbrezina,

not sure why, but patch backported by bot - 3104478 - doesn't remove 'sss_pac_responder_client.c', removed by original patch.

@sumit-bose sumit-bose force-pushed the SSSD-sssd-backport-pr8151-to-sssd-2-9 branch from ee10e6a to 913600f Compare November 19, 2025 08:37
@sumit-bose
Copy link
Contributor

sumit-bose commented Nov 19, 2025

@sumit-bose, @pbrezina,

not sure why, but patch backported by bot - 3104478 - doesn't remove 'sss_pac_responder_client.c', removed by original patch.

Hi,

good catch, I don't know why, I added the removal to the latest version.

bye,
Sumit

@alexey-tikhonov
Copy link
Member

alexey-tikhonov commented Nov 19, 2025

good catch, I don't know why, I added the removal to the latest version.

Thank you.
Still I'd like to understand if this is a bug in 'backport' CI job...

@sumit-bose
Copy link
Contributor

sumit-bose commented Nov 19, 2025

good catch, I don't know why, I added the removal to the latest version.

Thank you. Still I'd like to understand if this is a bug in 'backport' CI job...

Hi,

there was the same in #8189 and I guess the reason was that there was a conflict in the removed file and there might be no way to really express this in a commit?

bye,
Sumit

@alexey-tikhonov
Copy link
Member

alexey-tikhonov commented Nov 19, 2025

I guess the reason was that there was a conflict in the removed file and there might be no way to really express this in a commit?

Sounds plausible: 8672fba

@pbrezina, would it be possible to do anything about it?
It's very easy to miss this...

@alexey-tikhonov alexey-tikhonov removed the request for review from jakub-vavra-cz November 19, 2025 14:44
@sumit-bose @sssd-bot
tests: add test_pac_responder.py
01c8bfa 
This new system test is a replacment of the integration test with the
same name. It depends on a test binary which was added to the SSSD CI
containers in SSSD/sssd-ci-containers#150.

Reviewed-by: Alexey Tikhonov <atikhono@redhat.com>
Reviewed-by: Jakub Vávra <jvavra@redhat.com>
(cherry picked from commit c78855c)
@sumit-bose @sssd-bot
intg: remove test_pac_responder.py
d099ded 
This test was replaced by a system test with the same name.

Reviewed-by: Alexey Tikhonov <atikhono@redhat.com>
Reviewed-by: Jakub Vávra <jvavra@redhat.com>
(cherry picked from commit be020a3)
@sssd-bot
Copy link
Contributor Author

sssd-bot commented Nov 19, 2025

The pull request was accepted by @alexey-tikhonov with the following PR CI status:

🟢 CodeQL (success)
🟢 rpm-build:centos-stream-9-x86_64:upstream (success)
🟢 Analyze (target) / cppcheck (success)
🟢 Build / make-distcheck (success)
🟢 ci / prepare (success)
🔴 ci / system (centos-9) (failure)
🟢 Static code analysis / codeql (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.

@sssd-bot sssd-bot force-pushed the SSSD-sssd-backport-pr8151-to-sssd-2-9 branch from 913600f to d099ded Compare November 19, 2025 14:45
@pbrezina
Copy link
Member

pbrezina commented Nov 19, 2025

I guess the reason was that there was a conflict in the removed file and there might be no way to really express this in a commit?

Sounds plausible: 8672fba

@pbrezina, would it be possible to do anything about it? It's very easy to miss this...

I will look into it later. This is the backport logic: https://github.com/next-actions/backport/blob/master/backport.sh#L95-L114 let me know if you have some clever ideas.

@alexey-tikhonov alexey-tikhonov merged commit a945132 into SSSD:sssd-2-9 Nov 19, 2025
8 of 9 checks passed
@sssd-bot sssd-bot mentioned this pull request Nov 19, 2025
Merged
@pbrezina
Copy link
Member

pbrezina commented Nov 26, 2025

Since I didn't have any good idea, I solved it by adding git status to the PR description: next-actions/backport@d76bcb8

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

Reviewers

@alexey-tikhonov alexey-tikhonov alexey-tikhonov approved these changes

Assignees

@alexey-tikhonov alexey-tikhonov

Labels

Accepted backport-to-sssd-2-9-4 Corresponds to C8S

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@sssd-bot @alexey-tikhonov @sumit-bose @pbrezina @jakub-vavra-cz