Skip to content

[autobackport: sssd-2-11] rewriting memcache tests#8587

Merged
danlavu merged 2 commits intoSSSD:sssd-2-11from
sssd-bot:SSSD-sssd-backport-pr8485-to-sssd-2-11
Apr 14, 2026
Merged

[autobackport: sssd-2-11] rewriting memcache tests#8587
danlavu merged 2 commits intoSSSD:sssd-2-11from
sssd-bot:SSSD-sssd-backport-pr8485-to-sssd-2-11

Conversation

@sssd-bot
Copy link
Copy Markdown
Contributor

@sssd-bot sssd-bot commented Apr 8, 2026

This is an automatic backport of PR#8485 rewriting memcache tests 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-pr8485-to-sssd-2-11
git checkout SSSD-sssd-backport-pr8485-to-sssd-2-11
git push sssd-bot SSSD-sssd-backport-pr8485-to-sssd-2-11 --force

Original commits
428e613 - Reworked memcache tests * parametrized test cases * added colliding hash test case * remove poor test scenarios
7d9bdd5 - removing intg memcache tests

Backported commits

  • dd4c496 - Reworked memcache tests * parametrized test cases * added colliding hash test case * remove poor test scenarios
  • b9d84a4 - CONFLICT! removing intg memcache tests

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

  • CONFLICT! removing intg memcache tests
On branch SSSD-sssd-backport-pr8485-to-sssd-2-11
You are currently cherry-picking commit 7d9bdd508.
  (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:
	deleted:    src/tests/intg/test_memory_cache.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/tests/intg/Makefile.am

Original Pull Request Body

Copy link
Copy Markdown

@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 removes the integration-level memory cache tests and refactors the system-level memcache tests in src/tests/system/tests/test_memcache.py. The refactor introduces several helper functions and leverages pytest parametrization to consolidate test logic for users, groups, and initgroups, improving maintainability. However, a critical issue was found in src/tests/intg/Makefile.am, which contains unresolved merge conflict markers that must be fixed to ensure a valid build.

Comment thread src/tests/intg/Makefile.am Outdated
@danlavu danlavu force-pushed the SSSD-sssd-backport-pr8485-to-sssd-2-11 branch from b9d84a4 to 8d4f0d5 Compare April 10, 2026 16:06
@danlavu danlavu marked this pull request as ready for review April 13, 2026 22:42
@danlavu
Copy link
Copy Markdown

danlavu commented Apr 13, 2026

@andreboscatto @madhuriupadhye pings

@madhuriupadhye
Copy link
Copy Markdown
Contributor

After re-running CI failed jobs, getting same failures.

@alexey-tikhonov
Copy link
Copy Markdown
Member

After re-running CI failed jobs, getting same failures.

sssd-2-11 branch CI is in a poor state.
Having green system/c10s and system/f42 is enough here.

Dan Lavu added 2 commits April 14, 2026 13:50
* parametrized test cases
* added colliding hash test case
* remove poor test scenarios

(cherry picked from commit 428e613)
Reviewed-by: Andre Boscatto <aboscatt@redhat.com>
Reviewed-by: Madhuri Upadhye <mupadhye@redhat.com>
(cherry picked from commit 7d9bdd5)
Reviewed-by: Andre Boscatto <aboscatt@redhat.com>
Reviewed-by: Madhuri Upadhye <mupadhye@redhat.com>
@sssd-bot
Copy link
Copy Markdown
Contributor Author

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


🟢 CodeQL (success)
🟢 rpm-build:centos-stream-10-x86_64:upstream (success)
🟢 rpm-build:fedora-42-x86_64:upstream (success)
🔴 rpm-build:fedora-43-x86_64:upstream (failure)
🔴 rpm-build:fedora-44-x86_64:upstream (failure)
🔴 rpm-build:fedora-rawhide-x86_64:upstream (failure)
🔴 Build / make-distcheck (failure)
🟢 ci / intgcheck (centos-10) (success)
🟢 ci / intgcheck (fedora-42) (success)
🟢 ci / intgcheck (fedora-43) (success)
🟢 ci / intgcheck (fedora-44) (success)
🔴 ci / intgcheck (fedora-45) (failure)
🟢 ci / prepare (success)
🟢 ci / system (centos-10) (success)
🟢 ci / system (fedora-42) (success)
🔴 ci / system (fedora-43) (failure)
🔴 ci / system (fedora-44) (failure)
🔴 ci / system (fedora-45) (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-pr8485-to-sssd-2-11 branch from 8d4f0d5 to cb1f456 Compare April 14, 2026 13:50
@danlavu danlavu added the no-backport This should go to target branch only. label Apr 14, 2026
@danlavu danlavu merged commit d452df1 into SSSD:sssd-2-11 Apr 14, 2026
13 of 16 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.

5 participants