mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
Bugfixes in managed topology tests
Fixed a false negative related to replication taking some time: added wait_for_replication call before checking for new object in replicas. Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
This commit is contained in:
parent
1974f20aec
commit
1c79c1ea2d
@ -3,7 +3,6 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
import re
|
import re
|
||||||
import time
|
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
@ -122,7 +121,10 @@ class TestTopologyOptions(IntegrationTest):
|
|||||||
self.replicas[1].hostname)
|
self.replicas[1].hostname)
|
||||||
returncode, error = tasks.destroy_segment(self.master, deleteme)
|
returncode, error = tasks.destroy_segment(self.master, deleteme)
|
||||||
assert returncode == 0, error
|
assert returncode == 0, error
|
||||||
# make sure replica1 does not have segment that was deleted on master
|
# Wait till replication ends and make sure replica1 does not have
|
||||||
|
# segment that was deleted on master
|
||||||
|
replica1_ldap = self.replicas[0].ldap_connect()
|
||||||
|
tasks.wait_for_replication(replica1_ldap)
|
||||||
result3 = self.replicas[0].run_command(['ipa', 'topologysegment-find',
|
result3 = self.replicas[0].run_command(['ipa', 'topologysegment-find',
|
||||||
DOMAIN_SUFFIX_NAME]).stdout_text
|
DOMAIN_SUFFIX_NAME]).stdout_text
|
||||||
assert(deleteme not in result3), "%s: segment still exists" % deleteme
|
assert(deleteme not in result3), "%s: segment still exists" % deleteme
|
||||||
@ -131,7 +133,8 @@ class TestTopologyOptions(IntegrationTest):
|
|||||||
self.master.run_command(['ipa', 'user-add', 'someuser',
|
self.master.run_command(['ipa', 'user-add', 'someuser',
|
||||||
'--first', 'test',
|
'--first', 'test',
|
||||||
'--last', 'user'])
|
'--last', 'user'])
|
||||||
time.sleep(60) # replication requires some time
|
dest_ldap = self.replicas[1].ldap_connect()
|
||||||
|
tasks.wait_for_replication(dest_ldap)
|
||||||
result4 = self.replicas[1].run_command(['ipa', 'user-find'])
|
result4 = self.replicas[1].run_command(['ipa', 'user-find'])
|
||||||
assert('someuser' in result4.stdout_text), 'User not found: someuser'
|
assert('someuser' in result4.stdout_text), 'User not found: someuser'
|
||||||
# We end up having a line topology: master <-> replica1 <-> replica2
|
# We end up having a line topology: master <-> replica1 <-> replica2
|
||||||
|
Loading…
Reference in New Issue
Block a user