Skip to content

[autobackport: sssd-2-9-4] intg: remove test_session_recording.py - #8270

Merged
alexey-tikhonov merged 1 commit into
SSSD:sssd-2-9-4from
sssd-bot:SSSD-sssd-backport-pr8243-to-sssd-2-9-4
Dec 5, 2025
Merged

[autobackport: sssd-2-9-4] intg: remove test_session_recording.py#8270
alexey-tikhonov merged 1 commit into
SSSD:sssd-2-9-4from
sssd-bot:SSSD-sssd-backport-pr8243-to-sssd-2-9-4

Conversation

@sssd-bot

@sssd-bot sssd-bot commented Dec 4, 2025

Copy link
Copy Markdown
Contributor

This is an automatic backport of PR#8243 intg: remove test_session_recording.py to branch sssd-2-9-4, created by @spoore1.

Caution

@spoore1 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-pr8243-to-sssd-2-9-4
git checkout SSSD-sssd-backport-pr8243-to-sssd-2-9-4
git push sssd-bot SSSD-sssd-backport-pr8243-to-sssd-2-9-4 --force

Original commits
5023916 - intg: remove test_session_recording.py

Backported commits

  • 3a0e1fd - CONFLICT! intg: remove test_session_recording.py

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

  • CONFLICT! intg: remove test_session_recording.py
On branch SSSD-sssd-backport-pr8243-to-sssd-2-9-4
You are currently cherry-picking commit 502391658.
  (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/rm <file>..." as appropriate to mark resolution)
	both modified:   src/tests/intg/Makefile.am
	deleted by them: src/tests/intg/test_session_recording.py

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

Original Pull Request Body

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

Copy link
Copy Markdown

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 to remove the test_session_recording.py integration test. As noted in the pull request description, the patch did not apply cleanly and resulted in a merge conflict in src/tests/intg/Makefile.am. My review provides a fix for this conflict to correctly remove the test file reference while preserving other changes. This is a critical issue as the conflict markers will break the build.

Comment thread src/tests/intg/Makefile.am Outdated
@spoore1
spoore1 force-pushed the SSSD-sssd-backport-pr8243-to-sssd-2-9-4 branch from 3a0e1fd to 5321bc6 Compare December 4, 2025 16:57
@spoore1
spoore1 marked this pull request as ready for review December 5, 2025 00:57
@alexey-tikhonov
alexey-tikhonov removed the request for review from justin-stephenson December 5, 2025 09:19
@alexey-tikhonov alexey-tikhonov added no-backport This should go to target branch only. Trivial A single reviewer is sufficient to review the Pull Request Accepted labels Dec 5, 2025
Removing intg session recording test file and removing from Makefile.

Reviewed-by: Dan Lavu <dlavu@redhat.com>
(cherry picked from commit 5023916)
@sssd-bot

sssd-bot commented Dec 5, 2025

Copy link
Copy Markdown
Contributor Author

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


🟢 CodeQL (success)
🟢 Analyze (target) / cppcheck (success)
🟢 Build / make-distcheck (success)
🟢 ci / prepare (success)
🔴 ci / system (centos-8) (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-pr8243-to-sssd-2-9-4 branch from 5321bc6 to a48ed49 Compare December 5, 2025 09:20
@alexey-tikhonov
alexey-tikhonov merged commit 43a55da into SSSD:sssd-2-9-4 Dec 5, 2025
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Accepted no-backport This should go to target branch only. 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