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

@@ -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)

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)