From 057abace686bbd956988bab870dabf6c3c6f9f53 Mon Sep 17 00:00:00 2001 From: blue55 Date: Thu, 23 Mar 2017 14:37:10 +0800 Subject: [PATCH] Using assertIsNone() instead of assertEqual(None) TrivilalFix Following OpenStack Style Guidelines: [1] http://docs.openstack.org/developer/hacking/#unit-tests-and-assertraises [H203] Unit test assertions tend to give better messages for more specific assertions. As a result, assertIsNone(...) is preferred over assertEqual(None, ...) and assertIs(..., None) Change-Id: Ia4e28fbcb836df9f0bebe2734bceb0e2ca98a6b8 --- swift3/test/functional/test_bucket.py | 8 ++++---- swift3/test/functional/test_multi_upload.py | 4 ++-- swift3/test/functional/test_presigned.py | 8 ++++---- swift3/test/unit/test_etree.py | 2 +- swift3/test/unit/test_location.py | 2 +- swift3/test/unit/test_multi_upload.py | 10 +++++----- swift3/test/unit/test_s3_acl.py | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/swift3/test/functional/test_bucket.py b/swift3/test/functional/test_bucket.py index 2b8640c..c0828a3 100644 --- a/swift3/test/functional/test_bucket.py +++ b/swift3/test/functional/test_bucket.py @@ -55,8 +55,8 @@ class TestSwift3Bucket(Swift3FunctionalTestCase): elem = fromstring(body, 'ListBucketResult') self.assertEqual(elem.find('Name').text, bucket) - self.assertEqual(elem.find('Prefix').text, None) - self.assertEqual(elem.find('Marker').text, None) + self.assertIsNone(elem.find('Prefix').text) + self.assertIsNone(elem.find('Marker').text) self.assertEqual(elem.find('MaxKeys').text, str(CONF.max_bucket_listing)) self.assertEqual(elem.find('IsTruncated').text, 'false') @@ -72,8 +72,8 @@ class TestSwift3Bucket(Swift3FunctionalTestCase): elem = fromstring(body, 'ListBucketResult') self.assertEqual(elem.find('Name').text, bucket) - self.assertEqual(elem.find('Prefix').text, None) - self.assertEqual(elem.find('Marker').text, None) + self.assertIsNone(elem.find('Prefix').text) + self.assertIsNone(elem.find('Marker').text) self.assertEqual(elem.find('MaxKeys').text, str(CONF.max_bucket_listing)) self.assertEqual(elem.find('IsTruncated').text, 'false') diff --git a/swift3/test/functional/test_multi_upload.py b/swift3/test/functional/test_multi_upload.py index 51a25e7..0b31fca 100644 --- a/swift3/test/functional/test_multi_upload.py +++ b/swift3/test/functional/test_multi_upload.py @@ -127,9 +127,9 @@ class TestSwift3MultiUpload(Swift3FunctionalTestCase): self.assertEqual(headers['content-length'], str(len(body))) elem = fromstring(body, 'ListMultipartUploadsResult') self.assertEqual(elem.find('Bucket').text, bucket) - self.assertEqual(elem.find('KeyMarker').text, None) + self.assertIsNone(elem.find('KeyMarker').text) self.assertEqual(elem.find('NextKeyMarker').text, uploads[-1][0]) - self.assertEqual(elem.find('UploadIdMarker').text, None) + self.assertIsNone(elem.find('UploadIdMarker').text) self.assertEqual(elem.find('NextUploadIdMarker').text, uploads[-1][1]) self.assertEqual(elem.find('MaxUploads').text, '1000') self.assertTrue(elem.find('EncodingType') is None) diff --git a/swift3/test/functional/test_presigned.py b/swift3/test/functional/test_presigned.py index 84fa50e..a0f88f7 100644 --- a/swift3/test/functional/test_presigned.py +++ b/swift3/test/functional/test_presigned.py @@ -44,8 +44,8 @@ class TestSwift3PresignedUrls(Swift3FunctionalTestCase): elem = fromstring(resp.content, 'ListBucketResult') self.assertEqual(elem.find('Name').text, bucket) - self.assertEqual(elem.find('Prefix').text, None) - self.assertEqual(elem.find('Marker').text, None) + self.assertIsNone(elem.find('Prefix').text) + self.assertIsNone(elem.find('Marker').text) self.assertEqual(elem.find('MaxKeys').text, str(CONF.max_bucket_listing)) self.assertEqual(elem.find('IsTruncated').text, 'false') @@ -69,8 +69,8 @@ class TestSwift3PresignedUrls(Swift3FunctionalTestCase): elem = fromstring(resp.content, 'ListBucketResult') self.assertEqual(elem.find('Name').text, bucket) - self.assertEqual(elem.find('Prefix').text, None) - self.assertEqual(elem.find('Marker').text, None) + self.assertIsNone(elem.find('Prefix').text) + self.assertIsNone(elem.find('Marker').text) self.assertEqual(elem.find('MaxKeys').text, str(CONF.max_bucket_listing)) self.assertEqual(elem.find('IsTruncated').text, 'false') diff --git a/swift3/test/unit/test_etree.py b/swift3/test/unit/test_etree.py index 92608ae..e756d37 100644 --- a/swift3/test/unit/test_etree.py +++ b/swift3/test/unit/test_etree.py @@ -45,7 +45,7 @@ class TestSwift3Etree(unittest.TestCase): xml = test_xml('xmlns:s3="http://example.com/"', 's3:') elem = etree.fromstring(xml) - self.assertEqual(elem.find('./B'), None) + self.assertIsNone(elem.find('./B')) def test_xml_with_comments(self): xml = 'C' diff --git a/swift3/test/unit/test_location.py b/swift3/test/unit/test_location.py index 5f18fa5..0e902e0 100644 --- a/swift3/test/unit/test_location.py +++ b/swift3/test/unit/test_location.py @@ -41,7 +41,7 @@ class TestSwift3Location(Swift3TestCase): self.assertEqual(status.split()[0], '200') elem = fromstring(body, 'LocationConstraint') location = elem.text - self.assertEqual(location, None) + self.assertIsNone(location) def test_object_location_setting_as_us_west_1(self): CONF.location = 'us-west-1' diff --git a/swift3/test/unit/test_multi_upload.py b/swift3/test/unit/test_multi_upload.py index 020b4dd..281fd3c 100644 --- a/swift3/test/unit/test_multi_upload.py +++ b/swift3/test/unit/test_multi_upload.py @@ -202,8 +202,8 @@ class TestSwift3MultiUpload(Swift3TestCase): status, headers, body = self._test_bucket_multipart_uploads_GET() elem = fromstring(body, 'ListMultipartUploadsResult') self.assertEqual(elem.find('Bucket').text, 'bucket') - self.assertEqual(elem.find('KeyMarker').text, None) - self.assertEqual(elem.find('UploadIdMarker').text, None) + self.assertIsNone(elem.find('KeyMarker').text) + self.assertIsNone(elem.find('UploadIdMarker').text) self.assertEqual(elem.find('NextUploadIdMarker').text, 'Z') self.assertEqual(elem.find('MaxUploads').text, '1000') self.assertEqual(elem.find('IsTruncated').text, 'false') @@ -236,9 +236,9 @@ class TestSwift3MultiUpload(Swift3TestCase): self.assertEqual(status.split()[0], '200') elem = fromstring(body, 'ListMultipartUploadsResult') self.assertEqual(elem.find('Bucket').text, 'bucket') - self.assertEqual(elem.find('KeyMarker').text, None) - self.assertEqual(elem.find('UploadIdMarker').text, None) - self.assertEqual(elem.find('NextUploadIdMarker').text, None) + self.assertIsNone(elem.find('KeyMarker').text) + self.assertIsNone(elem.find('UploadIdMarker').text) + self.assertIsNone(elem.find('NextUploadIdMarker').text) self.assertEqual(elem.find('MaxUploads').text, '1000') self.assertEqual(elem.find('IsTruncated').text, 'false') self.assertEqual(len(elem.findall('Upload')), 0) diff --git a/swift3/test/unit/test_s3_acl.py b/swift3/test/unit/test_s3_acl.py index 4c5c423..643cd38 100644 --- a/swift3/test/unit/test_s3_acl.py +++ b/swift3/test/unit/test_s3_acl.py @@ -529,7 +529,7 @@ class TestSwift3S3Acl(Swift3TestCase): self.assertRaises(TypeError, fake_class.s3acl_error) self.assertRaises(AssertionError, fake_class.s3acl_assert_fail) self.assertRaises(TypeError, fake_class.s3acl_s3only_error) - self.assertEqual(None, fake_class.s3acl_s3only_no_error()) + self.assertIsNone(fake_class.s3acl_s3only_no_error()) if __name__ == '__main__': unittest.main()