From 87340e5f29905defbbc76ff17ae3db94befcbfe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Antal?= Date: Fri, 15 Jul 2016 14:18:09 +0200 Subject: [PATCH] Use more specific asserts in test/unit/account tests I changed asserts with more specific assert methods. e.g.: from assertTrue(sth == None) to assertIsNone(*) or assertTrue(isinstance(inst, type)) to assertIsInstace(inst, type) or assertTrue(not sth) to assertFalse(sth). The code gets more readable, and a better description will be shown on fail. Change-Id: Icdbf3c63fe8dd6db1129023885655a9f7032d4a7 --- test/unit/account/test_backend.py | 16 ++++++++-------- test/unit/account/test_server.py | 3 +-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/test/unit/account/test_backend.py b/test/unit/account/test_backend.py index ecc9e707ae..909957dcf0 100644 --- a/test/unit/account/test_backend.py +++ b/test/unit/account/test_backend.py @@ -87,7 +87,7 @@ class TestAccountBroker(unittest.TestCase): raise Exception('OMG') except Exception: pass - self.assertTrue(broker.conn is None) + self.assertIsNone(broker.conn) def test_empty(self): # Test AccountBroker.empty @@ -96,7 +96,7 @@ class TestAccountBroker(unittest.TestCase): self.assertTrue(broker.empty()) broker.put_container('o', Timestamp.now().internal, 0, 0, 0, POLICIES.default.idx) - self.assertTrue(not broker.empty()) + self.assertFalse(broker.empty()) sleep(.00001) broker.put_container('o', 0, Timestamp.now().internal, 0, 0, POLICIES.default.idx) @@ -106,7 +106,7 @@ class TestAccountBroker(unittest.TestCase): # Test AccountBroker.is_status_deleted broker1 = AccountBroker(':memory:', account='a') broker1.initialize(Timestamp.now().internal) - self.assertTrue(not broker1.is_status_deleted()) + self.assertFalse(broker1.is_status_deleted()) broker1.delete_db(Timestamp.now().internal) self.assertTrue(broker1.is_status_deleted()) broker2 = AccountBroker(':memory:', account='a') @@ -180,7 +180,7 @@ class TestAccountBroker(unittest.TestCase): broker.initialize(start) info = broker.get_info() self.assertEqual(info['put_timestamp'], Timestamp(start).internal) - self.assertTrue(Timestamp(info['created_at']) >= start) + self.assertGreaterEqual(Timestamp(info['created_at']), start) self.assertEqual(info['delete_timestamp'], '0') if self.__class__ == TestAccountBrokerBeforeMetadata: self.assertEqual(info['status_changed_at'], '0') @@ -193,7 +193,7 @@ class TestAccountBroker(unittest.TestCase): broker.delete_db(delete_timestamp) info = broker.get_info() self.assertEqual(info['put_timestamp'], Timestamp(start).internal) - self.assertTrue(Timestamp(info['created_at']) >= start) + self.assertGreaterEqual(Timestamp(info['created_at']), start) self.assertEqual(info['delete_timestamp'], delete_timestamp) self.assertEqual(info['status_changed_at'], delete_timestamp) @@ -1217,8 +1217,8 @@ class TestAccountBrokerBeforeSPI(TestAccountBroker): ''').fetchone()[0] except sqlite3.OperationalError as err: # confirm that the table doesn't have this column - self.assertTrue('no such column: storage_policy_index' in - str(err)) + self.assertIn('no such column: storage_policy_index', + str(err)) else: self.fail('broker did not raise sqlite3.OperationalError ' 'trying to select from storage_policy_index ' @@ -1591,7 +1591,7 @@ class TestAccountBrokerBeforePerPolicyContainerTrack( self.assertEqual(stats['object_count'], 0) self.assertEqual(stats['bytes_used'], 0) # un-migrated dbs should not return container_count - self.assertFalse('container_count' in stats) + self.assertNotIn('container_count', stats) # now force the migration policy_stats = self.broker.get_policy_stats(do_migrations=True) diff --git a/test/unit/account/test_server.py b/test/unit/account/test_server.py index e2ff6f2cda..da1712c210 100644 --- a/test/unit/account/test_server.py +++ b/test/unit/account/test_server.py @@ -66,8 +66,7 @@ class TestAccountController(unittest.TestCase): resp = server_handler.OPTIONS(req) self.assertEqual(200, resp.status_int) for verb in 'OPTIONS GET POST PUT DELETE HEAD REPLICATE'.split(): - self.assertTrue( - verb in resp.headers['Allow'].split(', ')) + self.assertIn(verb, resp.headers['Allow'].split(', ')) self.assertEqual(len(resp.headers['Allow'].split(', ')), 7) self.assertEqual(resp.headers['Server'], (server_handler.server_type + '/' + swift_version))