From 488744a005fb399af8d094ad7a62c1917410398c Mon Sep 17 00:00:00 2001 From: venkata edara Date: Wed, 22 Nov 2017 13:35:46 +0530 Subject: Rebase to Swift 2.15.1 (pike) Change-Id: I84ebb44c5c3cf2f80c50f2d4ae4bd92b619a4297 Signed-off-by: venkata edara Reviewed-on: https://review.gluster.org/18412 Reviewed-by: Prashanth Pai Tested-by: Prashanth Pai --- test/unit/obj/test_expirer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/unit/obj/test_expirer.py') diff --git a/test/unit/obj/test_expirer.py b/test/unit/obj/test_expirer.py index 4830a90..9849f6d 100644 --- a/test/unit/obj/test_expirer.py +++ b/test/unit/obj/test_expirer.py @@ -373,7 +373,7 @@ class TestObjectExpirer(TestCase): 'Pass beginning; 1 possible containers; 2 possible objects', 'Pass completed in 0s; 0 objects expired', ]) - self.assertTrue('error' not in logs) + self.assertNotIn('error', logs) # Reverse test to be sure it still would blow up the way expected. fake_swift = InternalClient([{'name': str(int(time() - 86400))}]) @@ -414,7 +414,7 @@ class TestObjectExpirer(TestCase): x = expirer.ObjectExpirer(self.conf, logger=self.logger, swift=fake_swift) x.run_once() - self.assertTrue('error' not in x.logger.all_log_lines()) + self.assertNotIn('error', x.logger.all_log_lines()) self.assertEqual(x.logger.get_lines_for_level('info'), [ 'Pass beginning; 1 possible containers; 2 possible objects', 'Pass completed in 0s; 0 objects expired', -- cgit