From 82314bd1201919e5db5e023046242230eec36cc6 Mon Sep 17 00:00:00 2001 From: Alistair Coles Date: Tue, 22 May 2018 12:57:16 +0100 Subject: [PATCH] Test rsync error log truncation Verify the log line truncation method is actually called. Related-Change: If063a12cac74b67078b6db1c4f489160a2a69de1 Change-Id: I8dcd0eac1396b251a2c2a31e167598bc1e48c463 --- test/unit/obj/test_replicator.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/unit/obj/test_replicator.py b/test/unit/obj/test_replicator.py index 963931610a..2dd2f92c89 100644 --- a/test/unit/obj/test_replicator.py +++ b/test/unit/obj/test_replicator.py @@ -2065,6 +2065,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, [ @@ -2073,6 +2074,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'