From e540effa692976c2eef766f1f735702ba5dc0950 Mon Sep 17 00:00:00 2001 From: tbordaz Date: Mon, 30 Nov 2020 09:03:33 +0100 Subject: [PATCH] Issue 4243 - Fix test: SyncRepl plugin provides a wrong cookie (#4467) Bug description: This test case was incorrect. During a refreshPersistent search, a cookie is sent with the intermediate message that indicates the end of the refresh phase. Then a second cookie is sent on the updated entry (group10) I believed this test was successful some time ago but neither python-ldap nor sync_repl changed (intermediate sent in post refresh). So the testcase was never successful :( Fix description: The fix is just to take into account the two expected cookies relates: https://github.com/389ds/389-ds-base/issues/4243 Reviewed by: Mark Reynolds Platforms tested: F31 --- .../tests/suites/syncrepl_plugin/basic_test.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dirsrvtests/tests/suites/syncrepl_plugin/basic_test.py b/dirsrvtests/tests/suites/syncrepl_plugin/basic_test.py index 79ec374bc..7b35537d5 100644 --- a/dirsrvtests/tests/suites/syncrepl_plugin/basic_test.py +++ b/dirsrvtests/tests/suites/syncrepl_plugin/basic_test.py @@ -589,7 +589,7 @@ def test_sync_repl_cookie_with_failure(topology, request): sync_repl.start() time.sleep(5) - # Add a test group just to check that sync_repl receives only one update + # Add a test group just to check that sync_repl receives that SyncControlInfo cookie group.append(groups.create(properties={'cn': 'group%d' % 10})) # create users, that automember/memberof will generate nested updates @@ -610,13 +610,15 @@ def test_sync_repl_cookie_with_failure(topology, request): time.sleep(10) cookies = sync_repl.get_result() - # checking that the cookie list contains only one entry - assert len(cookies) == 1 - prev = 0 + # checking that the cookie list contains only two entries + # the one from the SyncInfo/RefreshDelete that indicates the end of the refresh + # the the one from SyncStateControl related to the only updated entry (group10) + assert len(cookies) == 2 + prev = -1 for cookie in cookies: log.info('Check cookie %s' % cookie) - assert int(cookie) > 0 + assert int(cookie) >= 0 assert int(cookie) < 1000 assert int(cookie) > prev prev = int(cookie) -- 2.26.2