35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
|
From 44a762413c83f9637399afeb61b1e4b1ac111260 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Florence Blanc-Renaud <flo@redhat.com>
|
||
|
|
Date: Feb 14 2024 12:24:48 +0000
|
||
|
|
Subject: ipatests: fix tasks.wait_for_replication method
|
||
|
|
|
||
|
|
|
||
|
|
With the fix for https://pagure.io/freeipa/issue/9171, the
|
||
|
|
method entry.single_value['nsds5replicaupdateinprogress'] now
|
||
|
|
returns a Boolean instead of a string "TRUE"/"FALSE".
|
||
|
|
|
||
|
|
The method tasks.wait_for_replication needs to be fixed so that
|
||
|
|
it properly detects when replication is not done.
|
||
|
|
|
||
|
|
Fixes: https://pagure.io/freeipa/issue/9530
|
||
|
|
|
||
|
|
Signed-off-by: Florence Blanc-Renaud <flo@redhat.com>
|
||
|
|
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
|
||
|
|
|
||
|
|
---
|
||
|
|
|
||
|
|
diff --git a/ipatests/pytest_ipa/integration/tasks.py b/ipatests/pytest_ipa/integration/tasks.py
|
||
|
|
index 9068ba6..952c9e6 100755
|
||
|
|
--- a/ipatests/pytest_ipa/integration/tasks.py
|
||
|
|
+++ b/ipatests/pytest_ipa/integration/tasks.py
|
||
|
|
@@ -1510,7 +1510,7 @@ def wait_for_replication(ldap, timeout=30,
|
||
|
|
statuses = [entry.single_value[status_attr] for entry in entries]
|
||
|
|
wrong_statuses = [s for s in statuses
|
||
|
|
if not re.match(target_status_re, s)]
|
||
|
|
- if any(e.single_value[progress_attr] == 'TRUE' for e in entries):
|
||
|
|
+ if any(e.single_value[progress_attr] for e in entries):
|
||
|
|
msg = 'Replication not finished'
|
||
|
|
logger.debug(msg)
|
||
|
|
elif wrong_statuses:
|
||
|
|
|