openstack
/
swift
Code Issues Proposed changes

Fixes for mock 1.1 

The new release of mock 1.1 is more strict. It helped to find bugs in
tests.

Closes-Bug: #1473369
Change-Id: Id179513c6010d827cbcbdda7692a920e29213bcb
This commit is contained in:
Victor Stinner 2015-07-10 13:04:44 +02:00 committed by John Dickinson
parent 512b6a781e
commit b7f1768a17
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/unit/common/test_db_replicator.py
View File

@ -1171,10 +1171,10 @@ class TestDBReplicator(unittest.TestCase):
db_file = __file__
replicator = TestReplicator({})
replicator._http_connect(node, partition, db_file)
db_replicator.ReplConnection.assert_has_calls(
db_replicator.ReplConnection.assert_has_calls([
mock.call(node, partition,
os.path.basename(db_file).split('.', 1)[0],
replicator.logger))
replicator.logger)])
class TestReplToNode(unittest.TestCase):

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

@ -354,7 +354,7 @@ class TestWSGI(unittest.TestCase):
_eventlet.patcher.monkey_patch.assert_called_with(all=False,
socket=True)
_eventlet.debug.hub_exceptions.assert_called_with(False)
_wsgi.server.assert_called()
self.assertTrue(_wsgi.server.called)
args, kwargs = _wsgi.server.call_args
server_sock, server_app, server_logger = args
self.assertEquals(sock, server_sock)
@ -397,7 +397,7 @@ class TestWSGI(unittest.TestCase):
sock = listen(('localhost', 0))
wsgi.run_server(conf, logger, sock)
_wsgi.server.assert_called()
self.assertTrue(_wsgi.server.called)
args, kwargs = _wsgi.server.call_args
self.assertEquals(kwargs.get('capitalize_response_headers'), False)
@ -442,7 +442,7 @@ class TestWSGI(unittest.TestCase):
_eventlet.patcher.monkey_patch.assert_called_with(all=False,
socket=True)
_eventlet.debug.hub_exceptions.assert_called_with(False)
_wsgi.server.assert_called()
self.assertTrue(_wsgi.server.called)
args, kwargs = _wsgi.server.call_args
server_sock, server_app, server_logger = args
self.assertEquals(sock, server_sock)
@ -493,7 +493,7 @@ class TestWSGI(unittest.TestCase):
_eventlet.patcher.monkey_patch.assert_called_with(all=False,
socket=True)
_eventlet.debug.hub_exceptions.assert_called_with(True)
mock_server.assert_called()
self.assertTrue(mock_server.called)
args, kwargs = mock_server.call_args
server_sock, server_app, server_logger = args
self.assertEquals(sock, server_sock)

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

@ -718,7 +718,7 @@ class TestObjectExpirer(TestCase):
x = expirer.ObjectExpirer({})
x.swift.make_request = mock.MagicMock()
x.delete_actual_object(name, timestamp)
x.swift.make_request.assert_called_once()
self.assertEqual(x.swift.make_request.call_count, 1)
self.assertEqual(x.swift.make_request.call_args[0][1],
'/v1/' + urllib.quote(name))