From f34b8896f97ee8b29da7f167c7262071000727e4 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Wed, 4 Sep 2013 13:44:57 +0200 Subject: test_simple_replication: Fix waiting for replication The integration tests must wait for replication to happen before checking results. In some cases, the tests have failed because the checks that detect completed replication were insufficient. This fixes the code to: - Wait for replication to be completed on both servers - In the case of an error, continue waiting -- it might be the case that the DS is temporarily unreachable --- ipatests/test_integration/tasks.py | 3 +-- ipatests/test_integration/test_simple_replication.py | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'ipatests/test_integration') diff --git a/ipatests/test_integration/tasks.py b/ipatests/test_integration/tasks.py index 7ea0ce4f..de650f58 100644 --- a/ipatests/test_integration/tasks.py +++ b/ipatests/test_integration/tasks.py @@ -419,8 +419,7 @@ def wait_for_replication(ldap, timeout=30): if any(not e.single_value(status_attr).startswith('0 ') for e in entries): log.error('Replication error') - break - in_progress = [] + continue if any(e.single_value(progress_attr) == 'TRUE' for e in entries): log.debug('Replication in progress (waited %s/%ss)', i, timeout) diff --git a/ipatests/test_integration/test_simple_replication.py b/ipatests/test_integration/test_simple_replication.py index 998b1196..f1da22f5 100644 --- a/ipatests/test_integration/test_simple_replication.py +++ b/ipatests/test_integration/test_simple_replication.py @@ -36,6 +36,9 @@ class TestSimpleReplication(IntegrationTest): '--first', 'test', '--last', 'user']) + source_ldap = source_host.ldap_connect() + tasks.wait_for_replication(source_ldap) + ldap = dest_host.ldap_connect() tasks.wait_for_replication(ldap) -- cgit