openstack/swift
Code Issues Proposed changes

Merge "Replace assertEqual(None, *) with assertIsNone in tests"

Browse Source
This commit is contained in:
Jenkins 2016-02-24 03:29:58 +00:00 committed by Gerrit Code Review
commit 8f0ba56d0d
11 changed files with 50 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/unit/common/middleware/test_container_sync.py
View File

@ -68,8 +68,8 @@ cluster_dfw1 = http://dfw1.host/v1/
def test_current_not_set(self):
# no 'current' option set by default
self.assertEqual(None, self.sync.realm)
self.assertEqual(None, self.sync.cluster)
self.assertIsNone(self.sync.realm)
self.assertIsNone(self.sync.cluster)
info = {}
def capture_swift_info(key, **options):
@ -88,8 +88,8 @@ cluster_dfw1 = http://dfw1.host/v1/
self.conf = {'swift_dir': self.tempdir, 'current': 'foo'}
self.sync = container_sync.ContainerSync(self.app, self.conf,
logger=FakeLogger())
self.assertEqual(None, self.sync.realm)
self.assertEqual(None, self.sync.cluster)
self.assertIsNone(self.sync.realm)
self.assertIsNone(self.sync.cluster)
info = {}
def capture_swift_info(key, **options):

4
test/unit/common/middleware/test_keystoneauth.py
View File

@ -922,7 +922,7 @@ class TestAuthorize(BaseTestAuthorize):
# no valid identity info in headers
req = Request.blank('/v/a/c/o')
data = self.test_auth._keystone_identity(req.environ)
self.assertEqual(None, data)
self.assertIsNone(data)
# valid identity info in headers, but status unconfirmed
req.headers.update({'X-Identity-Status': 'Blah',
@ -936,7 +936,7 @@ class TestAuthorize(BaseTestAuthorize):
'X-Project-Domain-Id': project_domain[0],
'X-Project-Domain-Name': project_domain[1]})
data = self.test_auth._keystone_identity(req.environ)
self.assertEqual(None, data)
self.assertIsNone(data)
# valid identity info in headers, no token info in environ
req.headers.update({'X-Identity-Status': 'Confirmed'})

2
test/unit/common/middleware/test_slo.py
View File

@ -277,7 +277,7 @@ class TestSloMiddleware(SloTestCase):
'size_bytes': None, 'range': '0-40'}])
parsed = slo.parse_and_validate_input(data, '/v1/a/cont/man')
self.assertEqual('/cont/object', parsed[0]['path'])
self.assertEqual(None, parsed[0]['size_bytes'])
self.assertIsNone(parsed[0]['size_bytes'])
self.assertEqual([(0, 40)], parsed[0]['range'].ranges)

2
test/unit/common/middleware/test_tempauth.py
View File

@ -1316,7 +1316,7 @@ class TestAccountAcls(unittest.TestCase):
req = self._make_request(target, headers=good_headers)
resp = req.get_response(test_auth)
self.assertEqual(resp.status_int, 204)
self.assertEqual(None, req.headers.get(sysmeta_hdr))
self.assertIsNone(req.headers.get(sysmeta_hdr))
# syntactically valid acls should go through
update = {'x-account-access-control': good_acl}

14
test/unit/common/test_internal_client.py
View File

@ -493,7 +493,7 @@ class TestInternalClient(unittest.TestCase):
self.test.assertEqual('HEAD', method)
self.test.assertEqual(self.path, path)
self.test.assertEqual((2,), acceptable_statuses)
self.test.assertEqual(None, body_file)
self.test.assertIsNone(body_file)
return Response(self.resp_headers)
path = 'some_path'
@ -696,7 +696,7 @@ class TestInternalClient(unittest.TestCase):
self.test.assertEqual(self.path, path)
self.test.assertEqual(self.exp_headers, headers)
self.test.assertEqual((2,), acceptable_statuses)
self.test.assertEqual(None, body_file)
self.test.assertIsNone(body_file)
path = 'some_path'
metadata_prefix = 'some_key-'
@ -753,7 +753,7 @@ class TestInternalClient(unittest.TestCase):
self.test.assertEqual(self.path, path)
self.test.assertEqual({}, headers)
self.test.assertEqual((2, 404), acceptable_statuses)
self.test.assertEqual(None, body_file)
self.test.assertIsNone(body_file)
return self.resp
account, container, obj = path_parts()
@ -850,7 +850,7 @@ class TestInternalClient(unittest.TestCase):
self.test.assertEqual(self.path, path)
self.test.assertEqual({}, headers)
self.test.assertEqual((2, 404), acceptable_statuses)
self.test.assertEqual(None, body_file)
self.test.assertIsNone(body_file)
return self.resp
account, container, obj = path_parts()
@ -880,7 +880,7 @@ class TestInternalClient(unittest.TestCase):
self.test.assertEqual(self.path, path)
self.test.assertEqual(self.headers, headers)
self.test.assertEqual((2,), acceptable_statuses)
self.test.assertEqual(None, body_file)
self.test.assertIsNone(body_file)
account, container, obj = path_parts()
path = make_path(account, container)
@ -904,7 +904,7 @@ class TestInternalClient(unittest.TestCase):
self.test.assertEqual(self.path, path)
self.test.assertEqual({}, headers)
self.test.assertEqual((2, 404), acceptable_statuses)
self.test.assertEqual(None, body_file)
self.test.assertIsNone(body_file)
account, container, obj = path_parts()
path = make_path(account, container)
@ -966,7 +966,7 @@ class TestInternalClient(unittest.TestCase):
self.test.assertEqual(self.path, path)
self.test.assertEqual({}, headers)
self.test.assertEqual((2, 404), acceptable_statuses)
self.test.assertEqual(None, body_file)
self.test.assertIsNone(body_file)
account, container, obj = path_parts()
path = make_path(account, container, obj)

2
test/unit/common/test_manager.py
View File

@ -612,7 +612,7 @@ class TestServer(unittest.TestCase):
# test invalid value in pid file
server = manager.Server('auth', run_dir=t)
pid_file, pid = next(server.iter_pid_files())
self.assertEqual(None, pid)
self.assertIsNone(pid)
# test object-server doesn't steal pids from object-replicator
server = manager.Server('object', run_dir=t)
self.assertRaises(StopIteration, server.iter_pid_files().next)

46
test/unit/common/test_utils.py
View File

@ -2945,8 +2945,8 @@ cluster_dfw1 = http://dfw1.host/v1/
'/sda1/p/a',
environ={'REQUEST_METHOD': 'GET'})
res = Response()
self.assertEqual(None, utils.get_policy_index(req.headers,
res.headers))
self.assertIsNone(utils.get_policy_index(req.headers,
res.headers))
# The policy of a container can be specified by the response header
req = Request.blank(
@ -3006,15 +3006,15 @@ cluster_dfw1 = http://dfw1.host/v1/
env = {}
logger = FakeLogger()
with mock.patch('swift.common.utils.logging', logger):
self.assertEqual(None, utils.cache_from_env(env))
self.assertIsNone(utils.cache_from_env(env))
self.assertTrue(err_msg in logger.get_lines_for_level('error'))
logger = FakeLogger()
with mock.patch('swift.common.utils.logging', logger):
self.assertEqual(None, utils.cache_from_env(env, False))
self.assertIsNone(utils.cache_from_env(env, False))
self.assertTrue(err_msg in logger.get_lines_for_level('error'))
logger = FakeLogger()
with mock.patch('swift.common.utils.logging', logger):
self.assertEqual(None, utils.cache_from_env(env, True))
self.assertIsNone(utils.cache_from_env(env, True))
self.assertEqual(0, len(logger.get_lines_for_level('error')))
def test_fsync_dir(self):
@ -3616,7 +3616,7 @@ class TestStatsdLogging(unittest.TestCase):
def test_get_logger_statsd_client_not_specified(self):
logger = utils.get_logger({}, 'some-name', log_route='some-route')
# white-box construction validation
self.assertEqual(None, logger.logger.statsd_client)
self.assertIsNone(logger.logger.statsd_client)
def test_get_logger_statsd_client_defaults(self):
logger = utils.get_logger({'log_statsd_host': 'some.host.com'},
@ -4175,23 +4175,23 @@ class TestStatsdLoggingDelegation(unittest.TestCase):
'log_statsd_port': str(self.port),
}, 'some-name')
# Delegate methods are no-ops
self.assertEqual(None, logger.update_stats('foo', 88))
self.assertEqual(None, logger.update_stats('foo', 88, 0.57))
self.assertEqual(None, logger.update_stats('foo', 88,
sample_rate=0.61))
self.assertEqual(None, logger.increment('foo'))
self.assertEqual(None, logger.increment('foo', 0.57))
self.assertEqual(None, logger.increment('foo', sample_rate=0.61))
self.assertEqual(None, logger.decrement('foo'))
self.assertEqual(None, logger.decrement('foo', 0.57))
self.assertEqual(None, logger.decrement('foo', sample_rate=0.61))
self.assertEqual(None, logger.timing('foo', 88.048))
self.assertEqual(None, logger.timing('foo', 88.57, 0.34))
self.assertEqual(None, logger.timing('foo', 88.998, sample_rate=0.82))
self.assertEqual(None, logger.timing_since('foo', 8938))
self.assertEqual(None, logger.timing_since('foo', 8948, 0.57))
self.assertEqual(None, logger.timing_since('foo', 849398,
sample_rate=0.61))
self.assertIsNone(logger.update_stats('foo', 88))
self.assertIsNone(logger.update_stats('foo', 88, 0.57))
self.assertIsNone(logger.update_stats('foo', 88,
sample_rate=0.61))
self.assertIsNone(logger.increment('foo'))
self.assertIsNone(logger.increment('foo', 0.57))
self.assertIsNone(logger.increment('foo', sample_rate=0.61))
self.assertIsNone(logger.decrement('foo'))
self.assertIsNone(logger.decrement('foo', 0.57))
self.assertIsNone(logger.decrement('foo', sample_rate=0.61))
self.assertIsNone(logger.timing('foo', 88.048))
self.assertIsNone(logger.timing('foo', 88.57, 0.34))
self.assertIsNone(logger.timing('foo', 88.998, sample_rate=0.82))
self.assertIsNone(logger.timing_since('foo', 8938))
self.assertIsNone(logger.timing_since('foo', 8948, 0.57))
self.assertIsNone(logger.timing_since('foo', 849398,
sample_rate=0.61))
# Now, the queue should be empty (no UDP packets sent)
self.assertRaises(Empty, self.queue.get_nowait)

14
test/unit/common/test_wsgi.py
View File

@ -939,7 +939,7 @@ class TestServersPerPortStrategy(unittest.TestCase):
self.assertEqual([mock.call(0o22)], self.mock_umask.mock_calls)
def test_no_fork_sock(self):
self.assertEqual(None, self.strategy.no_fork_sock())
self.assertIsNone(self.strategy.no_fork_sock())
def test_new_worker_socks(self):
self.strategy.bind_ports()
@ -1067,7 +1067,7 @@ class TestServersPerPortStrategy(unittest.TestCase):
# It's ok to register_worker_exit for a PID that's already had its
# socket closed due to orphaning.
# This is one of the workers for port 6006 that already got reaped.
self.assertEqual(None, self.strategy.register_worker_exit(89))
self.assertIsNone(self.strategy.register_worker_exit(89))
def test_post_fork_hook(self):
self.strategy.post_fork_hook()
@ -1117,7 +1117,7 @@ class TestWorkersStrategy(unittest.TestCase):
self.assertEqual(0.5, self.strategy.loop_timeout())
def test_binding(self):
self.assertEqual(None, self.strategy.bind_ports())
self.assertIsNone(self.strategy.bind_ports())
self.assertEqual('abc', self.strategy.sock)
self.assertEqual([
@ -1136,7 +1136,7 @@ class TestWorkersStrategy(unittest.TestCase):
def test_no_fork_sock(self):
self.strategy.bind_ports()
self.assertEqual(None, self.strategy.no_fork_sock())
self.assertIsNone(self.strategy.no_fork_sock())
self.conf['workers'] = 0
self.strategy = wsgi.WorkersStrategy(self.conf, self.logger)
@ -1150,7 +1150,7 @@ class TestWorkersStrategy(unittest.TestCase):
sock_count = 0
for s, i in self.strategy.new_worker_socks():
self.assertEqual('abc', s)
self.assertEqual(None, i) # unused for this strategy
self.assertIsNone(i) # unused for this strategy
self.strategy.register_worker_start(s, 'unused', pid)
pid += 1
sock_count += 1
@ -1172,7 +1172,7 @@ class TestWorkersStrategy(unittest.TestCase):
for s, i in self.strategy.new_worker_socks():
self.assertEqual('abc', s)
self.assertEqual(None, i) # unused for this strategy
self.assertIsNone(i) # unused for this strategy
self.strategy.register_worker_start(s, 'unused', pid)
pid += 1
sock_count += 1
@ -1186,7 +1186,7 @@ class TestWorkersStrategy(unittest.TestCase):
def test_post_fork_hook(self):
# Just don't crash or do something stupid
self.assertEqual(None, self.strategy.post_fork_hook())
self.assertIsNone(self.strategy.post_fork_hook())
def test_shutdown_sockets(self):
self.mock_get_socket.return_value = mock.MagicMock()

2
test/unit/obj/test_diskfile.py
View File

@ -1563,7 +1563,7 @@ class TestECDiskFileManager(DiskFileManagerMixin, unittest.TestCase):
info = mgr.parse_on_disk_filename(fname)
self.assertEqual(ts, info['timestamp'])
self.assertEqual(ext, info['ext'])
self.assertEqual(None, info['frag_index'])
self.assertIsNone(info['frag_index'])
self.assertEqual(mgr.make_on_disk_filename(**info), fname)
def test_parse_on_disk_filename_errors(self):

3
test/unit/obj/test_updater.py
View File

@ -302,8 +302,7 @@ class TestObjectUpdater(unittest.TestCase):
self.assertTrue(os.path.exists(op_path))
self.assertEqual(cu.logger.get_increment_counts(),
{'failures': 1, 'unlinks': 1})
self.assertEqual(None,
pickle.load(open(op_path)).get('successes'))
self.assertIsNone(pickle.load(open(op_path)).get('successes'))
bindsock = listen(('127.0.0.1', 0))

4
test/unit/proxy/test_server.py
View File

@ -8821,7 +8821,7 @@ class TestAccountControllerFakeGetResponse(unittest.TestCase):
req = make_test_request(verb, swift_owner=False)
resp = app.handle_request(req)
h = resp.headers
self.assertEqual(None, h.get(ext_header))
self.assertIsNone(h.get(ext_header))
# swift_owner unset: GET/HEAD shouldn't return sensitive info
make_canned_response(verb)
@ -8829,7 +8829,7 @@ class TestAccountControllerFakeGetResponse(unittest.TestCase):
del req.environ['swift_owner']
resp = app.handle_request(req)
h = resp.headers
self.assertEqual(None, h.get(ext_header))
self.assertIsNone(h.get(ext_header))
# Verify that PUT/POST requests remap sysmeta headers from acct server
with patch_account_controller_method('make_requests'):