x/swift3
Code Issues Proposed changes

Using assertIsNone() instead of assertEqual(None)

Browse Source 
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
This commit is contained in:
blue55 2017-03-23 14:37:10 +08:00
parent cd094eea4a
commit 057abace68
7 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
swift3/test/functional/test_bucket.py
View File

@ -55,8 +55,8 @@ class TestSwift3Bucket(Swift3FunctionalTestCase):
elem = fromstring(body, 'ListBucketResult') elem = fromstring(body, 'ListBucketResult')
self.assertEqual(elem.find('Name').text, bucket) self.assertEqual(elem.find('Name').text, bucket)
self.assertEqual(elem.find('Prefix').text, None) self.assertIsNone(elem.find('Prefix').text)
self.assertEqual(elem.find('Marker').text, None) self.assertIsNone(elem.find('Marker').text)
self.assertEqual(elem.find('MaxKeys').text, self.assertEqual(elem.find('MaxKeys').text,
str(CONF.max_bucket_listing)) str(CONF.max_bucket_listing))
self.assertEqual(elem.find('IsTruncated').text, 'false') self.assertEqual(elem.find('IsTruncated').text, 'false')
@ -72,8 +72,8 @@ class TestSwift3Bucket(Swift3FunctionalTestCase):
elem = fromstring(body, 'ListBucketResult') elem = fromstring(body, 'ListBucketResult')
self.assertEqual(elem.find('Name').text, bucket) self.assertEqual(elem.find('Name').text, bucket)
self.assertEqual(elem.find('Prefix').text, None) self.assertIsNone(elem.find('Prefix').text)
self.assertEqual(elem.find('Marker').text, None) self.assertIsNone(elem.find('Marker').text)
self.assertEqual(elem.find('MaxKeys').text, self.assertEqual(elem.find('MaxKeys').text,
str(CONF.max_bucket_listing)) str(CONF.max_bucket_listing))
self.assertEqual(elem.find('IsTruncated').text, 'false') self.assertEqual(elem.find('IsTruncated').text, 'false')

4
swift3/test/functional/test_multi_upload.py
View File

@ -127,9 +127,9 @@ class TestSwift3MultiUpload(Swift3FunctionalTestCase):
self.assertEqual(headers['content-length'], str(len(body))) self.assertEqual(headers['content-length'], str(len(body)))
elem = fromstring(body, 'ListMultipartUploadsResult') elem = fromstring(body, 'ListMultipartUploadsResult')
self.assertEqual(elem.find('Bucket').text, bucket) 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('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('NextUploadIdMarker').text, uploads[-1][1])
self.assertEqual(elem.find('MaxUploads').text, '1000') self.assertEqual(elem.find('MaxUploads').text, '1000')
self.assertTrue(elem.find('EncodingType') is None) self.assertTrue(elem.find('EncodingType') is None)

8
swift3/test/functional/test_presigned.py
View File

@ -44,8 +44,8 @@ class TestSwift3PresignedUrls(Swift3FunctionalTestCase):
elem = fromstring(resp.content, 'ListBucketResult') elem = fromstring(resp.content, 'ListBucketResult')
self.assertEqual(elem.find('Name').text, bucket) self.assertEqual(elem.find('Name').text, bucket)
self.assertEqual(elem.find('Prefix').text, None) self.assertIsNone(elem.find('Prefix').text)
self.assertEqual(elem.find('Marker').text, None) self.assertIsNone(elem.find('Marker').text)
self.assertEqual(elem.find('MaxKeys').text, self.assertEqual(elem.find('MaxKeys').text,
str(CONF.max_bucket_listing)) str(CONF.max_bucket_listing))
self.assertEqual(elem.find('IsTruncated').text, 'false') self.assertEqual(elem.find('IsTruncated').text, 'false')
@ -69,8 +69,8 @@ class TestSwift3PresignedUrls(Swift3FunctionalTestCase):
elem = fromstring(resp.content, 'ListBucketResult') elem = fromstring(resp.content, 'ListBucketResult')
self.assertEqual(elem.find('Name').text, bucket) self.assertEqual(elem.find('Name').text, bucket)
self.assertEqual(elem.find('Prefix').text, None) self.assertIsNone(elem.find('Prefix').text)
self.assertEqual(elem.find('Marker').text, None) self.assertIsNone(elem.find('Marker').text)
self.assertEqual(elem.find('MaxKeys').text, self.assertEqual(elem.find('MaxKeys').text,
str(CONF.max_bucket_listing)) str(CONF.max_bucket_listing))
self.assertEqual(elem.find('IsTruncated').text, 'false') self.assertEqual(elem.find('IsTruncated').text, 'false')

2
swift3/test/unit/test_etree.py
View File

@ -45,7 +45,7 @@ class TestSwift3Etree(unittest.TestCase):
xml = test_xml('xmlns:s3="http://example.com/"', 's3:') xml = test_xml('xmlns:s3="http://example.com/"', 's3:')
elem = etree.fromstring(xml) elem = etree.fromstring(xml)
self.assertEqual(elem.find('./B'), None) self.assertIsNone(elem.find('./B'))
def test_xml_with_comments(self): def test_xml_with_comments(self):
xml = '<A><!-- comment --><B>C</B></A>' xml = '<A><!-- comment --><B>C</B></A>'

2
swift3/test/unit/test_location.py
View File

@ -41,7 +41,7 @@ class TestSwift3Location(Swift3TestCase):
self.assertEqual(status.split()[0], '200') self.assertEqual(status.split()[0], '200')
elem = fromstring(body, 'LocationConstraint') elem = fromstring(body, 'LocationConstraint')
location = elem.text location = elem.text
self.assertEqual(location, None) self.assertIsNone(location)
def test_object_location_setting_as_us_west_1(self): def test_object_location_setting_as_us_west_1(self):
CONF.location = 'us-west-1' CONF.location = 'us-west-1'

10
swift3/test/unit/test_multi_upload.py
View File

@ -202,8 +202,8 @@ class TestSwift3MultiUpload(Swift3TestCase):
status, headers, body = self._test_bucket_multipart_uploads_GET() status, headers, body = self._test_bucket_multipart_uploads_GET()
elem = fromstring(body, 'ListMultipartUploadsResult') elem = fromstring(body, 'ListMultipartUploadsResult')
self.assertEqual(elem.find('Bucket').text, 'bucket') self.assertEqual(elem.find('Bucket').text, 'bucket')
self.assertEqual(elem.find('KeyMarker').text, None) self.assertIsNone(elem.find('KeyMarker').text)
self.assertEqual(elem.find('UploadIdMarker').text, None) self.assertIsNone(elem.find('UploadIdMarker').text)
self.assertEqual(elem.find('NextUploadIdMarker').text, 'Z') self.assertEqual(elem.find('NextUploadIdMarker').text, 'Z')
self.assertEqual(elem.find('MaxUploads').text, '1000') self.assertEqual(elem.find('MaxUploads').text, '1000')
self.assertEqual(elem.find('IsTruncated').text, 'false') self.assertEqual(elem.find('IsTruncated').text, 'false')
@ -236,9 +236,9 @@ class TestSwift3MultiUpload(Swift3TestCase):
self.assertEqual(status.split()[0], '200') self.assertEqual(status.split()[0], '200')
elem = fromstring(body, 'ListMultipartUploadsResult') elem = fromstring(body, 'ListMultipartUploadsResult')
self.assertEqual(elem.find('Bucket').text, 'bucket') self.assertEqual(elem.find('Bucket').text, 'bucket')
self.assertEqual(elem.find('KeyMarker').text, None) self.assertIsNone(elem.find('KeyMarker').text)
self.assertEqual(elem.find('UploadIdMarker').text, None) self.assertIsNone(elem.find('UploadIdMarker').text)
self.assertEqual(elem.find('NextUploadIdMarker').text, None) self.assertIsNone(elem.find('NextUploadIdMarker').text)
self.assertEqual(elem.find('MaxUploads').text, '1000') self.assertEqual(elem.find('MaxUploads').text, '1000')
self.assertEqual(elem.find('IsTruncated').text, 'false') self.assertEqual(elem.find('IsTruncated').text, 'false')
self.assertEqual(len(elem.findall('Upload')), 0) self.assertEqual(len(elem.findall('Upload')), 0)

2
swift3/test/unit/test_s3_acl.py
View File

@ -529,7 +529,7 @@ class TestSwift3S3Acl(Swift3TestCase):
self.assertRaises(TypeError, fake_class.s3acl_error) self.assertRaises(TypeError, fake_class.s3acl_error)
self.assertRaises(AssertionError, fake_class.s3acl_assert_fail) self.assertRaises(AssertionError, fake_class.s3acl_assert_fail)
self.assertRaises(TypeError, fake_class.s3acl_s3only_error) 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__': if __name__ == '__main__':
unittest.main() unittest.main()