From 668242c4229d8bdb0f1b2d3183efcc33c6b67154 Mon Sep 17 00:00:00 2001 From: Tim Burke Date: Fri, 3 Apr 2020 10:44:25 -0700 Subject: [PATCH] pep8: Turn on E305 Change-Id: Ia968ec7375ab346a2155769a46e74ce694a57fc2 --- swift/common/linkat.py | 1 + swift/common/splice.py | 2 ++ swift/common/utils.py | 2 ++ test/functional/__init__.py | 1 + test/functional/s3api/test_multi_upload.py | 1 + test/functional/s3api/test_service.py | 1 + test/probe/test_empty_device_handoff.py | 1 + test/unit/__init__.py | 1 + test/unit/cli/test_form_signature.py | 1 + test/unit/common/middleware/crypto/test_kms_keymaster.py | 1 + test/unit/common/middleware/s3api/test_cfg.py | 1 + test/unit/common/middleware/s3api/test_logging.py | 1 + test/unit/common/middleware/s3api/test_multi_delete.py | 1 + test/unit/common/middleware/s3api/test_s3_acl.py | 1 + test/unit/common/middleware/s3api/test_s3api.py | 1 + test/unit/common/middleware/s3api/test_service.py | 1 + test/unit/common/middleware/s3api/test_subresource.py | 1 + test/unit/common/middleware/s3api/test_utils.py | 1 + test/unit/common/middleware/test_account_quotas.py | 1 + test/unit/common/middleware/test_keystoneauth.py | 1 + test/unit/common/middleware/test_name_check.py | 1 + test/unit/common/middleware/test_quotas.py | 1 + test/unit/common/middleware/test_tempauth.py | 1 + test/unit/common/test_direct_client.py | 1 + test/unit/common/test_exceptions.py | 1 + test/unit/common/test_internal_client.py | 1 + test/unit/common/test_manager.py | 1 + test/unit/container/test_updater.py | 1 + test/unit/obj/test_diskfile.py | 1 + test/unit/obj/test_replicator.py | 1 + tox.ini | 3 +-- 31 files changed, 33 insertions(+), 2 deletions(-) diff --git a/swift/common/linkat.py b/swift/common/linkat.py index d36411a0d6..3de45e2a3d 100644 --- a/swift/common/linkat.py +++ b/swift/common/linkat.py @@ -79,5 +79,6 @@ class Linkat(object): return self._c_linkat(olddirfd, oldpath, newdirfd, newpath, flags) + linkat = Linkat() del Linkat diff --git a/swift/common/splice.py b/swift/common/splice.py index 3d25d08386..a365a93bbd 100644 --- a/swift/common/splice.py +++ b/swift/common/splice.py @@ -98,6 +98,7 @@ class Tee(object): return self._c_tee is not None + tee = Tee() del Tee @@ -195,5 +196,6 @@ class Splice(object): return self._c_splice is not None + splice = Splice() del Splice diff --git a/swift/common/utils.py b/swift/common/utils.py index 5c27089673..afa9f41c8e 100644 --- a/swift/common/utils.py +++ b/swift/common/utils.py @@ -137,6 +137,7 @@ def NR_ioprio_set(): raise OSError("Swift doesn't support ionice priority for %s %s" % (architecture, arch_bits)) + # this syscall integer probably only works on x86_64 linux systems, you # can check if it's correct on yours with something like this: """ @@ -168,6 +169,7 @@ IOPRIO_CLASS_SHIFT = 13 def IOPRIO_PRIO_VALUE(class_, data): return (((class_) << IOPRIO_CLASS_SHIFT) | data) + # Used by hash_path to offer a bit more security when generating hashes for # paths. It simply appends this value to all paths; guessing the hash a path # will end up with would also require knowing this suffix. diff --git a/test/functional/__init__.py b/test/functional/__init__.py index c2d9c250c7..37b0931310 100644 --- a/test/functional/__init__.py +++ b/test/functional/__init__.py @@ -725,6 +725,7 @@ def in_process_setup(the_object_server=object_server): create_account('AUTH_test') create_account('AUTH_test2') + cluster_info = {} diff --git a/test/functional/s3api/test_multi_upload.py b/test/functional/s3api/test_multi_upload.py index ba800dde67..de61551e0e 100644 --- a/test/functional/s3api/test_multi_upload.py +++ b/test/functional/s3api/test_multi_upload.py @@ -1105,5 +1105,6 @@ class TestS3ApiMultiUploadSigV4(TestS3ApiMultiUpload): self.conn.make_request('DELETE', bucket) self.assertEqual(status, 204) # sanity + if __name__ == '__main__': unittest.main() diff --git a/test/functional/s3api/test_service.py b/test/functional/s3api/test_service.py index 4fd8e74666..3eb75dff5e 100644 --- a/test/functional/s3api/test_service.py +++ b/test/functional/s3api/test_service.py @@ -96,5 +96,6 @@ class TestS3ApiServiceSigV4(TestS3ApiService): def setUp(self): super(TestS3ApiServiceSigV4, self).setUp() + if __name__ == '__main__': unittest.main() diff --git a/test/probe/test_empty_device_handoff.py b/test/probe/test_empty_device_handoff.py index 36e2084eb9..9a7f4234ca 100644 --- a/test/probe/test_empty_device_handoff.py +++ b/test/probe/test_empty_device_handoff.py @@ -172,5 +172,6 @@ class TestEmptyDevice(ReplProbeTest): else: self.fail("Expected ClientException but didn't get it") + if __name__ == '__main__': main() diff --git a/test/unit/__init__.py b/test/unit/__init__.py index 5e6f5e99d7..67b6424566 100644 --- a/test/unit/__init__.py +++ b/test/unit/__init__.py @@ -64,6 +64,7 @@ import unittest class SkipTest(unittest.SkipTest): pass + EMPTY_ETAG = md5().hexdigest() # try not to import this module from swift diff --git a/test/unit/cli/test_form_signature.py b/test/unit/cli/test_form_signature.py index 538baefb2c..944589145b 100644 --- a/test/unit/cli/test_form_signature.py +++ b/test/unit/cli/test_form_signature.py @@ -111,5 +111,6 @@ class TestFormSignature(unittest.TestCase): '-922337203685477580799999999999999', key]) self.assertNotEqual(exitcode, 0) + if __name__ == '__main__': unittest.main() diff --git a/test/unit/common/middleware/crypto/test_kms_keymaster.py b/test/unit/common/middleware/crypto/test_kms_keymaster.py index 28222a27bd..9d86bb7e2a 100644 --- a/test/unit/common/middleware/crypto/test_kms_keymaster.py +++ b/test/unit/common/middleware/crypto/test_kms_keymaster.py @@ -89,6 +89,7 @@ def mock_keystone_password_side_effect(auth_url, username, password, user_domain_id, trust_id, domain_id, domain_name, project_id, project_domain_id, reauthenticate) + ERR_MESSAGE_SECRET_INCORRECTLY_SPECIFIED = 'Secret incorrectly specified.' ERR_MESSAGE_KEY_UUID_NOT_FOUND = 'Key not found, uuid: ' diff --git a/test/unit/common/middleware/s3api/test_cfg.py b/test/unit/common/middleware/s3api/test_cfg.py index 2a0347c14e..64ffc0fa30 100644 --- a/test/unit/common/middleware/s3api/test_cfg.py +++ b/test/unit/common/middleware/s3api/test_cfg.py @@ -40,5 +40,6 @@ class TestS3ApiCfg(unittest.TestCase): self.assertEqual(conf['b'], 100) self.assertEqual(conf['c'], False) + if __name__ == '__main__': unittest.main() diff --git a/test/unit/common/middleware/s3api/test_logging.py b/test/unit/common/middleware/s3api/test_logging.py index 067f109d87..6f0b2655ae 100644 --- a/test/unit/common/middleware/s3api/test_logging.py +++ b/test/unit/common/middleware/s3api/test_logging.py @@ -62,5 +62,6 @@ class TestS3ApiLogging(S3ApiTestCase): status, headers, body = self.call_s3api(req) self.assertEqual(self._get_error_code(body), 'NoLoggingStatusForKey') + if __name__ == '__main__': unittest.main() diff --git a/test/unit/common/middleware/s3api/test_multi_delete.py b/test/unit/common/middleware/s3api/test_multi_delete.py index 148866e694..02ee5d32fa 100644 --- a/test/unit/common/middleware/s3api/test_multi_delete.py +++ b/test/unit/common/middleware/s3api/test_multi_delete.py @@ -531,5 +531,6 @@ class TestS3ApiMultiDelete(S3ApiTestCase): self._test_no_body(use_transfer_encoding=True) self._test_no_body(use_transfer_encoding=True, string_to_md5=b'test') + if __name__ == '__main__': unittest.main() diff --git a/test/unit/common/middleware/s3api/test_s3_acl.py b/test/unit/common/middleware/s3api/test_s3_acl.py index b9db66aca4..48f5439162 100644 --- a/test/unit/common/middleware/s3api/test_s3_acl.py +++ b/test/unit/common/middleware/s3api/test_s3_acl.py @@ -537,5 +537,6 @@ class TestS3ApiS3Acl(S3ApiTestCase): self.assertRaises(TypeError, fake_class.s3acl_s3only_error) self.assertIsNone(fake_class.s3acl_s3only_no_error()) + if __name__ == '__main__': unittest.main() diff --git a/test/unit/common/middleware/s3api/test_s3api.py b/test/unit/common/middleware/s3api/test_s3api.py index 690eda6df3..d27e49b0be 100644 --- a/test/unit/common/middleware/s3api/test_s3api.py +++ b/test/unit/common/middleware/s3api/test_s3api.py @@ -1251,5 +1251,6 @@ class TestS3ApiMiddleware(S3ApiTestCase): self.assertEqual(body, b'') self.assertEqual(1, mock_req.call_count) + if __name__ == '__main__': unittest.main() diff --git a/test/unit/common/middleware/s3api/test_service.py b/test/unit/common/middleware/s3api/test_service.py index f32046052a..fbb999dc35 100644 --- a/test/unit/common/middleware/s3api/test_service.py +++ b/test/unit/common/middleware/s3api/test_service.py @@ -233,5 +233,6 @@ class TestS3ApiService(S3ApiTestCase): self.assertTrue(i[0] in names) self.assertEqual(len(self.swift.calls_with_headers), 11) + if __name__ == '__main__': unittest.main() diff --git a/test/unit/common/middleware/s3api/test_subresource.py b/test/unit/common/middleware/s3api/test_subresource.py index 05526971b1..c881547cc7 100644 --- a/test/unit/common/middleware/s3api/test_subresource.py +++ b/test/unit/common/middleware/s3api/test_subresource.py @@ -363,5 +363,6 @@ class TestS3ApiSubresource(unittest.TestCase): func = lambda: '' in grantee self.assertRaises(S3NotImplemented, func) + if __name__ == '__main__': unittest.main() diff --git a/test/unit/common/middleware/s3api/test_utils.py b/test/unit/common/middleware/s3api/test_utils.py index ca67d06758..49b17c563c 100644 --- a/test/unit/common/middleware/s3api/test_utils.py +++ b/test/unit/common/middleware/s3api/test_utils.py @@ -129,5 +129,6 @@ class TestS3ApiUtils(unittest.TestCase): os.environ['TZ'] = orig_tz time.tzset() + if __name__ == '__main__': unittest.main() diff --git a/test/unit/common/middleware/test_account_quotas.py b/test/unit/common/middleware/test_account_quotas.py index e6f095bf0d..4bf9e6b2d5 100644 --- a/test/unit/common/middleware/test_account_quotas.py +++ b/test/unit/common/middleware/test_account_quotas.py @@ -521,5 +521,6 @@ class AccountQuotaCopyingTestCases(unittest.TestCase): res = req.get_response(self.copy_filter) self.assertEqual(res.status_int, 412) + if __name__ == '__main__': unittest.main() diff --git a/test/unit/common/middleware/test_keystoneauth.py b/test/unit/common/middleware/test_keystoneauth.py index ba63fceab3..34d39f489b 100644 --- a/test/unit/common/middleware/test_keystoneauth.py +++ b/test/unit/common/middleware/test_keystoneauth.py @@ -1609,5 +1609,6 @@ class PrefixAccount(unittest.TestCase): self.assertFalse(test_auth._account_matches_tenant( 'PRE2_1234', '5678')) + if __name__ == '__main__': unittest.main() diff --git a/test/unit/common/middleware/test_name_check.py b/test/unit/common/middleware/test_name_check.py index e69c6522fb..a9d56f117d 100644 --- a/test/unit/common/middleware/test_name_check.py +++ b/test/unit/common/middleware/test_name_check.py @@ -147,5 +147,6 @@ class TestSwiftInfo(unittest.TestCase): self.assertEqual(swift_info['name_check'].get('forbidden_regexp'), r"/\./|/\.\./|/\.$") + if __name__ == '__main__': unittest.main() diff --git a/test/unit/common/middleware/test_quotas.py b/test/unit/common/middleware/test_quotas.py index 3a9112d7d0..0ad1ea87c3 100644 --- a/test/unit/common/middleware/test_quotas.py +++ b/test/unit/common/middleware/test_quotas.py @@ -356,5 +356,6 @@ class ContainerQuotaCopyingTestCases(unittest.TestCase): res = req.get_response(self.copy_filter) self.assertEqual(res.status_int, 200) + if __name__ == '__main__': unittest.main() diff --git a/test/unit/common/middleware/test_tempauth.py b/test/unit/common/middleware/test_tempauth.py index fafeffccd5..11edf3bf48 100644 --- a/test/unit/common/middleware/test_tempauth.py +++ b/test/unit/common/middleware/test_tempauth.py @@ -1828,5 +1828,6 @@ class TestUtilityMethods(unittest.TestCase): req = Request({'PATH_INFO': '/'}) self.assertRaises(ValueError, auth_inst.account_acls, req) + if __name__ == '__main__': unittest.main() diff --git a/test/unit/common/test_direct_client.py b/test/unit/common/test_direct_client.py index a714d16ba9..f15aab2883 100644 --- a/test/unit/common/test_direct_client.py +++ b/test/unit/common/test_direct_client.py @@ -922,5 +922,6 @@ class TestUTF8DirectClient(TestDirectClient): self.container = self.container.encode('utf-8') self.obj = self.obj.encode('utf-8') + if __name__ == '__main__': unittest.main() diff --git a/test/unit/common/test_exceptions.py b/test/unit/common/test_exceptions.py index 6ff77a55d5..6dbb0627a3 100644 --- a/test/unit/common/test_exceptions.py +++ b/test/unit/common/test_exceptions.py @@ -46,5 +46,6 @@ class TestExceptions(unittest.TestCase): http_response_content='content') self.assertEqual(str(exc), strerror) + if __name__ == '__main__': unittest.main() diff --git a/test/unit/common/test_internal_client.py b/test/unit/common/test_internal_client.py index 088e67fec9..da055d7653 100644 --- a/test/unit/common/test_internal_client.py +++ b/test/unit/common/test_internal_client.py @@ -1691,5 +1691,6 @@ class TestSimpleClient(unittest.TestCase): # See above self.assertEqual('https', args[0].type) + if __name__ == '__main__': unittest.main() diff --git a/test/unit/common/test_manager.py b/test/unit/common/test_manager.py index 1191bd3710..5e6296f8a0 100644 --- a/test/unit/common/test_manager.py +++ b/test/unit/common/test_manager.py @@ -2279,5 +2279,6 @@ class TestManager(unittest.TestCase): self.assertEqual(status, 0) self.assertEqual(m.cmd_was_called, True) + if __name__ == '__main__': unittest.main() diff --git a/test/unit/container/test_updater.py b/test/unit/container/test_updater.py index 56f3c59438..bc3a8450f7 100644 --- a/test/unit/container/test_updater.py +++ b/test/unit/container/test_updater.py @@ -528,5 +528,6 @@ class TestContainerUpdater(unittest.TestCase): self.assertEqual(info['reported_object_count'], 0) self.assertEqual(info['reported_bytes_used'], 0) + if __name__ == '__main__': unittest.main() diff --git a/test/unit/obj/test_diskfile.py b/test/unit/obj/test_diskfile.py index 8af231351d..2adf631a7e 100644 --- a/test/unit/obj/test_diskfile.py +++ b/test/unit/obj/test_diskfile.py @@ -8388,5 +8388,6 @@ class TestHashesHelpers(unittest.TestCase): result = diskfile.read_hashes(self.testdir) self.assertFalse(result['valid']) + if __name__ == '__main__': unittest.main() diff --git a/test/unit/obj/test_replicator.py b/test/unit/obj/test_replicator.py index 7d6015f574..b94bc8f01e 100644 --- a/test/unit/obj/test_replicator.py +++ b/test/unit/obj/test_replicator.py @@ -73,6 +73,7 @@ def mock_http_connect(status): return return lambda *args, **kwargs: FakeConn(status, *args, **kwargs) + process_errors = [] diff --git a/tox.ini b/tox.ini index c5d5544750..68f5bad75f 100644 --- a/tox.ini +++ b/tox.ini @@ -129,13 +129,12 @@ commands = bandit -c bandit.yaml -r swift -n 5 # H501: Do not use self.__dict__ for string formatting # Disabled with going to hacking 2.0, needs further investigation and # changes to enable: -# E305 expected 2 blank lines after class or function definition, found 1 # E402: module level import not at top of file # E731 do not assign a lambda expression, use a def # Swift team needs to decide if they want to enable either of these: # W503: line break before binary operator # W504: line break after binary operator -ignore = H101,H202,H301,H306,H404,H405,H501,W503,W504,E305,E402,E731 +ignore = H101,H202,H301,H306,H404,H405,H501,W503,W504,E402,E731 exclude = .venv,.tox,dist,*egg filename = *.py,bin/* show-source = True