Skip to content

[autobackport: sssd-2-9] Tests/remove converted multihost - #9578

Merged
spoore1 merged 3 commits into
SSSD:sssd-2-9from
sssd-bot:SSSD-sssd-backport-pr9576-to-sssd-2-9
Oct 30, 2026
Merged

spoore1 merged 3 commits into
SSSD:sssd-2-9from
sssd-bot:SSSD-sssd-backport-pr9576-to-sssd-2-9

Conversation

@sssd-bot

Copy link
Copy Markdown
Contributor

This is an automatic backport of PR#9576 Tests/remove converted multihost to branch sssd-2-9, created by @madhuriupadhye.

Caution

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

Original commits
0d1754d - tests: remove multihost tests already converted to system tests
b1c984a - tests: drop unused converted pytest marker from multihost

Backported commits

  • 7a1eab6 - CONFLICT! tests: remove multihost tests already converted to system tests
  • 48358ff - tests: drop unused converted pytest marker from multihost

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

  • CONFLICT! tests: remove multihost tests already converted to system tests
On branch SSSD-sssd-backport-pr9576-to-sssd-2-9
You are currently cherry-picking commit 0d1754dcf.
  (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)

Changes to be committed:
	modified:   src/tests/multihost/ad/test_adparameters_ported.py
	modified:   src/tests/multihost/alltests/test_ldap_extra_attrs.py
	deleted:    src/tests/multihost/alltests/test_password_policy.py

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

Original Pull Request Body

@sssd-bot
sssd-bot requested a review from spoore1 October 29, 2026 20:43
@madhuriupadhye
madhuriupadhye force-pushed the SSSD-sssd-backport-pr9576-to-sssd-2-9 branch from 48358ff to b1aa86d Compare October 30, 2026 11:29
@madhuriupadhye

madhuriupadhye commented Oct 30, 2026 •

Copy link
Copy Markdown
Contributor

Note: In test_cache_testing.py, test_0001 / 0002 / 0013 / 0014 are removed even though this branch has no @pytest.mark.converted on them. On master they were marked converted and dropped; 2-9 lacked the marker (cherry-pick conflict). We kept master’s removal so 2-9 stays aligned.

Note: Removed leftover alltests/test_config_validation.py. That file is already gone on master; only sssd-2-9/ sssd-2-9-4 still had it (one non-converted test after earlier cleanup). Dropped it so these branches match master.

@madhuriupadhye madhuriupadhye added Waiting for review Tests no-backport This should go to target branch only. labels Oct 30, 2026
@madhuriupadhye
madhuriupadhye marked this pull request as ready for review October 30, 2026 11:39

@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

Madhuri Upadhye and others added 3 commits October 30, 2026 16:13
Drop @pytest.mark.converted cases from the legacy multihost suites so
they no longer duplicate coverage that lives in the new framework.
Also clear the unused converted marker from pytest.ini files.

Co-authored-by: Cursor <cursoragent@cursor.com>
Reviewed-by: Scott Poore <spoore@redhat.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
Reviewed-by: Scott Poore <spoore@redhat.com>
File is already gone on master; drop the remaining non-converted
test so this branch matches.

Co-authored-by: Cursor <cursoragent@cursor.com>
Reviewed-by: Scott Poore <spoore@redhat.com>
@sssd-bot

Copy link
Copy Markdown
Contributor Author

The pull request was accepted by @spoore1 with the following PR CI status:


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


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-pr9576-to-sssd-2-9 branch from 8a6a05a to 242bde0 Compare October 30, 2026 16:13
@spoore1
spoore1 merged commit 16aad1e into SSSD:sssd-2-9 Oct 30, 2026
6 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. Tests

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants