openstack/swift
Code Issues Proposed changes

Merge "probetests: make negative assertion more meaningful"

Browse Source
This commit is contained in:
Zuul 2019-02-18 18:50:47 +00:00 committed by Gerrit Code Review
commit 89b3adc9fb
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/probe/test_replication_servers_working.py
View File

@ -150,9 +150,10 @@ class TestReplicatorFunctions(ReplProbeTest):
raise raise
time.sleep(1) time.sleep(1)
self.replicators.stop()
# Delete directories and files in objects storage without # Delete directories and files in objects storage without
# deleting file "hashes.pkl". # deleting file "hashes.pkl".
# Check, that files not replicated.
for directory in os.listdir(os.path.join(test_node, data_dir)): for directory in os.listdir(os.path.join(test_node, data_dir)):
for input_dir in os.listdir(os.path.join( for input_dir in os.listdir(os.path.join(
test_node, data_dir, directory)): test_node, data_dir, directory)):
@ -161,10 +162,8 @@ class TestReplicatorFunctions(ReplProbeTest):
shutil.rmtree(os.path.join( shutil.rmtree(os.path.join(
test_node, data_dir, directory, input_dir)) test_node, data_dir, directory, input_dir))
# We will keep trying these tests until they pass for up to 60s self.replicators.once()
begin = time.time() # Check, that files not replicated.
while True:
try:
for directory in os.listdir(os.path.join( for directory in os.listdir(os.path.join(
test_node, data_dir)): test_node, data_dir)):
for input_dir in os.listdir(os.path.join( for input_dir in os.listdir(os.path.join(
@ -172,12 +171,8 @@ class TestReplicatorFunctions(ReplProbeTest):
self.assertFalse(os.path.isdir( self.assertFalse(os.path.isdir(
os.path.join(test_node, data_dir, os.path.join(test_node, data_dir,
directory, input_dir))) directory, input_dir)))
break
except Exception:
if time.time() - begin > 60:
raise
time.sleep(1)
self.replicators.start()
# Now, delete file "hashes.pkl". # Now, delete file "hashes.pkl".
# Check, that all files were replicated. # Check, that all files were replicated.
for directory in os.listdir(os.path.join(test_node, data_dir)): for directory in os.listdir(os.path.join(test_node, data_dir)):