openstack/swift
Code Issues Proposed changes

Merge "Follow up the reconstructor test coverage"

Browse Source
This commit is contained in:
Jenkins
2017-03-07 15:10:03 +00:00
committed by Gerrit Code Review
parent 30524392f8 0e44770991
commit 7f953ce0b9
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/unit/obj/test_reconstructor.py
View File

@@ -657,17 +657,29 @@ class TestGlobalSetupObjectReconstructor(unittest.TestCase):
resp = do_test(200) resp = do_test(200)
self.assertEqual(resp.status, 200) self.assertEqual(resp.status, 200)
resp = do_test(400) resp = do_test(400)
# on the error case return value will be None instead of response
self.assertIsNone(resp)
# ... and log warnings for 400
for line in self.logger.get_lines_for_level('warning'): for line in self.logger.get_lines_for_level('warning'):
self.assertIn('Invalid response 400', line) self.assertIn('Invalid response 400', line)
self.logger._clear() self.logger._clear()
resp = do_test(Exception()) resp = do_test(Exception())
self.assertIsNone(resp)
# exception should result in error logs
for line in self.logger.get_lines_for_level('error'): for line in self.logger.get_lines_for_level('error'):
self.assertIn('Trying to GET', line) self.assertIn('Trying to GET', line)
self.logger._clear() self.logger._clear()
# Timeout also should result in error logs
resp = do_test(Timeout()) resp = do_test(Timeout())
self.assertIsNone(resp)
for line in self.logger.get_lines_for_level('error'): for line in self.logger.get_lines_for_level('error'):
self.assertIn('Timeout (Nones)', line) self.assertIn('Trying to GET', line)
# sanity Timeout has extra message in the error log
self.assertIn('Timeout', line)
def test_reconstructor_does_not_log_on_404(self): def test_reconstructor_does_not_log_on_404(self):
part = self.part_nums[0] part = self.part_nums[0]