openstack/swift
Code Issues Proposed changes

Merge "Fix StopIteration noise in obj/test_replicator.py"

Browse Source
This commit is contained in:
Jenkins 2017-07-18 03:28:08 +00:00 committed by Gerrit Code Review
commit 269d314dd8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/unit/obj/test_replicator.py
View File

@ -328,10 +328,9 @@ class TestObjectReplicator(unittest.TestCase):
while True: while True:
yield 60 yield 60
with _mock_process(process_arg_checker):
with mock.patch('time.time') as time_mock:
for cycle in range(1, 10): for cycle in range(1, 10):
time_mock.side_effect = _infinite_gen() with _mock_process(process_arg_checker):
with mock.patch('time.time', side_effect=_infinite_gen()):
replicator.run_once() replicator.run_once()
self.assertEqual((start + 1 + cycle) % 10, self.assertEqual((start + 1 + cycle) % 10,
replicator.replication_cycle) replicator.replication_cycle)
@ -345,6 +344,7 @@ class TestObjectReplicator(unittest.TestCase):
self.assertIn('replication_last', recon) self.assertIn('replication_last', recon)
expected = 'Object replication complete (once). (1.00 minutes)' expected = 'Object replication complete (once). (1.00 minutes)'
self.assertIn(expected, self.logger.get_lines_for_level('info')) self.assertIn(expected, self.logger.get_lines_for_level('info'))
self.assertFalse(self.logger.get_lines_for_level('error'))
object_replicator.http_connect = was_connector object_replicator.http_connect = was_connector
# policy 1 # policy 1