From 4e3690c3d859b08021a3e5e1b4c31b67efc86a78 Mon Sep 17 00:00:00 2001 From: Alexey Tikhonov Date: Thu, 21 Mar 2024 15:53:44 +0100 Subject: [PATCH] TESTS only: backport `sync_files_provider()` from b9c1d7d667d49080c27641fb4a800bd4c2612d43 Reviewed-by: Justin Stephenson (cherry picked from commit ea2d0aab36e033ef76e533af287e35059a754ec2) This is only needed to make CI::intg-tests green and not intended for downstream packaging. --- src/tests/intg/test_files_provider.py | 13 +++++++++++++ src/tests/intg/test_pam_responder.py | 1 + 2 files changed, 14 insertions(+) diff --git a/src/tests/intg/test_files_provider.py b/src/tests/intg/test_files_provider.py index fa503dddd0f..c318d733cda 100644 --- a/src/tests/intg/test_files_provider.py +++ b/src/tests/intg/test_files_provider.py @@ -456,6 +456,19 @@ def sssd_id_sync(name): return res, groups +def sync_files_provider(name=None): + """ + Tests with files provider can fail because files provider did not yet + finish updating its cache. Polling for presents of the canary user makes + sure that we wait until the cache is updated. + """ + if name is None: + name = CANARY["name"] + + ret = poll_canary(call_sssd_getpwnam, name) + assert ret + + # Helper functions def user_generator(seqnum): return dict(name='user%d' % seqnum, diff --git a/src/tests/intg/test_pam_responder.py b/src/tests/intg/test_pam_responder.py index 0fbf8065e49..a4b36c0f0c3 100644 --- a/src/tests/intg/test_pam_responder.py +++ b/src/tests/intg/test_pam_responder.py @@ -34,6 +34,7 @@ import pytest +from .test_files_provider import sync_files_provider from intg.util import unindent LDAP_BASE_DN = "dc=example,dc=com"