From 266fbc683c0637916ef445ffeb03951b4d44d20b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20B=C5=99ezina?= Date: Tue, 26 Nov 2019 12:26:32 +0100 Subject: [PATCH 1/2] tests: fix race confition in files provider tests Lets give files provider more time to load changes from files to avoid race condition failures. --- src/tests/intg/test_files_provider.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tests/intg/test_files_provider.py b/src/tests/intg/test_files_provider.py index 9f3aad9949..3a54c57b59 100644 --- a/src/tests/intg/test_files_provider.py +++ b/src/tests/intg/test_files_provider.py @@ -451,7 +451,7 @@ def user_generator(seqnum): shell='/bin/bash') -def check_user(exp_user, delay=1.0): +def check_user(exp_user, delay=3.0): if delay > 0: time.sleep(delay) @@ -466,7 +466,7 @@ def group_generator(seqnum): mem=[]) -def check_group(exp_group, delay=1.0): +def check_group(exp_group, delay=3.0): if delay > 0: time.sleep(delay) @@ -475,7 +475,7 @@ def check_group(exp_group, delay=1.0): assert found_group == exp_group -def check_group_by_gid(exp_group, delay=1.0): +def check_group_by_gid(exp_group, delay=3.0): if delay > 0: time.sleep(delay) @@ -779,7 +779,7 @@ def test_add_remove_add_file_group(setup_gr_with_canary, files_domain_only): check_group(GROUP1) setup_gr_with_canary.groupdel(GROUP1["name"]) - time.sleep(1) + time.sleep(3) res, group = call_sssd_getgrnam(GROUP1["name"]) assert res == NssReturnCode.NOTFOUND From 5d7c9f755644dac214b52b1f31e13efd18b1a854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20B=C5=99ezina?= Date: Tue, 26 Nov 2019 12:42:27 +0100 Subject: [PATCH 2/2] test: fix race condition in enumeration tests --- src/tests/intg/test_enumeration.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/tests/intg/test_enumeration.py b/src/tests/intg/test_enumeration.py index c105c6df02..eb416100eb 100644 --- a/src/tests/intg/test_enumeration.py +++ b/src/tests/intg/test_enumeration.py @@ -33,7 +33,8 @@ from util import * LDAP_BASE_DN = "dc=example,dc=com" -INTERACTIVE_TIMEOUT = 4 +ENUMERATION_TIMEOUT = 4 +INTERACTIVE_TIMEOUT = ENUMERATION_TIMEOUT*2 @pytest.fixture(scope="module") @@ -151,7 +152,7 @@ def format_interactive_conf(ldap_conn, schema): ldap_enumeration_refresh_timeout = {0} ldap_purge_cache_timeout = 1 entry_cache_timeout = {0} - """).format(INTERACTIVE_TIMEOUT) + """).format(ENUMERATION_TIMEOUT) def create_conf_file(contents):