openstack/swift
Code Issues Proposed changes

Merge "Test rsync error log truncation"

Browse Source
This commit is contained in:
Zuul 2018-05-22 19:54:58 +00:00 committed by Gerrit Code Review
commit ffd640565f
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2074,6 +2074,7 @@ class TestObjectReplicator(unittest.TestCase):
mock_http_connect(200)), \
mock.patch.object(self.replicator, 'rsync_timeout', 0.01), \
mock.patch('eventlet.green.subprocess.Popen', new_mock):
self.replicator.rsync_error_log_line_length = 20
self.replicator.run_once()
for proc in mock_procs:
self.assertEqual(proc._calls, [
@ -2082,6 +2083,10 @@ class TestObjectReplicator(unittest.TestCase):
('wait', 'killed'),
])
self.assertEqual(len(mock_procs), 2)
error_lines = self.replicator.logger.get_lines_for_level('error')
# verify logs are truncated to rsync_error_log_line_length
self.assertEqual('Killing long-running', error_lines[0])
self.assertEqual('Killing long-running', error_lines[1])
def test_replicate_rsync_timeout_wedged(self):
cur_part = '0'