diff options
| -rw-r--r-- | ipatests/test_integration/tasks.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/ipatests/test_integration/tasks.py b/ipatests/test_integration/tasks.py index 5a9d526f0..f6fa45140 100644 --- a/ipatests/test_integration/tasks.py +++ b/ipatests/test_integration/tasks.py @@ -1067,8 +1067,15 @@ def wait_for_replication(ldap, timeout=30): filter='(objectclass=nsds5replicationagreement)', attrs_list=[status_attr, progress_attr]) log.debug('Replication agreements: \n%s', _entries_to_ldif(entries)) - if any(not e.single_value[status_attr].startswith('0 ') - for e in entries): + if any( + not ( + # older DS format + e.single_value[status_attr].startswith('0 ') or + # newer DS format + e.single_value[status_attr].startswith('Error (0) ') + ) + for e in entries + ): log.error('Replication error') continue if any(e.single_value[progress_attr] == 'TRUE' for e in entries): |