x/python-ganttclient
Code Issues Proposed changes

Use self.mox instead of create a new self.mocker

Browse Source 
Change-Id: I3406ae9f59e4880ad036329168cbba710aa4dea0
This commit is contained in:
Johannes Erdfelt
2012-03-03 00:02:15 +00:00
parent 8bb578b2fb
commit d81e8d8b89
1 changed files with 17 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
nova/tests/rpc/test_qpid.py
View File

@@ -56,7 +56,7 @@ class RpcQpidTestCase(test.TestCase):
"""
def setUp(self):
self.mocker = mox.Mox()
super(RpcQpidTestCase, self).setUp()
self.mock_connection = None
self.mock_session = None
@@ -73,8 +73,6 @@ class RpcQpidTestCase(test.TestCase):
qpid.messaging.Sender = lambda *_x, **_y: self.mock_sender
qpid.messaging.Receiver = lambda *_x, **_y: self.mock_receiver
super(RpcQpidTestCase, self).setUp()
def tearDown(self):
if qpid:
qpid.messaging.Connection = self.orig_connection
@@ -86,31 +84,27 @@ class RpcQpidTestCase(test.TestCase):
# in self._setup_to_server_tests()
impl_qpid.Connection.pool.connection_cls = impl_qpid.Connection
self.mocker.ResetAll()
super(RpcQpidTestCase, self).tearDown()
@test.skip_if(qpid is None, "Test requires qpid")
def test_create_connection(self):
self.mock_connection = self.mocker.CreateMock(self.orig_connection)
self.mock_session = self.mocker.CreateMock(self.orig_session)
self.mock_connection = self.mox.CreateMock(self.orig_connection)
self.mock_session = self.mox.CreateMock(self.orig_session)
self.mock_connection.opened().AndReturn(False)
self.mock_connection.open()
self.mock_connection.session().AndReturn(self.mock_session)
self.mock_connection.close()
self.mocker.ReplayAll()
self.mox.ReplayAll()
connection = impl_qpid.create_connection()
connection.close()
self.mocker.VerifyAll()
def _test_create_consumer(self, fanout):
self.mock_connection = self.mocker.CreateMock(self.orig_connection)
self.mock_session = self.mocker.CreateMock(self.orig_session)
self.mock_receiver = self.mocker.CreateMock(self.orig_receiver)
self.mock_connection = self.mox.CreateMock(self.orig_connection)
self.mock_session = self.mox.CreateMock(self.orig_session)
self.mock_receiver = self.mox.CreateMock(self.orig_receiver)
self.mock_connection.opened().AndReturn(False)
self.mock_connection.open()
@@ -134,7 +128,7 @@ class RpcQpidTestCase(test.TestCase):
self.mock_receiver.capacity = 1
self.mock_connection.close()
self.mocker.ReplayAll()
self.mox.ReplayAll()
connection = impl_qpid.create_connection()
connection.create_consumer("impl_qpid_test",
@@ -142,8 +136,6 @@ class RpcQpidTestCase(test.TestCase):
fanout)
connection.close()
self.mocker.VerifyAll()
@test.skip_if(qpid is None, "Test requires qpid")
def test_create_consumer(self):
self._test_create_consumer(fanout=False)
@@ -153,10 +145,9 @@ class RpcQpidTestCase(test.TestCase):
self._test_create_consumer(fanout=True)
def _test_cast(self, fanout, server_params=None):
self.mock_connection = self.mocker.CreateMock(self.orig_connection)
self.mock_session = self.mocker.CreateMock(self.orig_session)
self.mock_sender = self.mocker.CreateMock(self.orig_sender)
self.mock_connection = self.mox.CreateMock(self.orig_connection)
self.mock_session = self.mox.CreateMock(self.orig_session)
self.mock_sender = self.mox.CreateMock(self.orig_sender)
self.mock_connection.opened().AndReturn(False)
self.mock_connection.open()
@@ -180,7 +171,7 @@ class RpcQpidTestCase(test.TestCase):
self.mock_session.close()
self.mock_connection.session().AndReturn(self.mock_session)
self.mocker.ReplayAll()
self.mox.ReplayAll()
try:
ctx = context.RequestContext("user", "project")
@@ -201,8 +192,6 @@ class RpcQpidTestCase(test.TestCase):
method = impl_qpid.cast
method(*args)
self.mocker.VerifyAll()
finally:
while impl_qpid.Connection.pool.free_items:
# Pull the mock connection object out of the connection pool so
@@ -251,10 +240,10 @@ class RpcQpidTestCase(test.TestCase):
self._test_cast(fanout=True, server_params=server_params)
def _test_call(self, multi):
self.mock_connection = self.mocker.CreateMock(self.orig_connection)
self.mock_session = self.mocker.CreateMock(self.orig_session)
self.mock_sender = self.mocker.CreateMock(self.orig_sender)
self.mock_receiver = self.mocker.CreateMock(self.orig_receiver)
self.mock_connection = self.mox.CreateMock(self.orig_connection)
self.mock_session = self.mox.CreateMock(self.orig_session)
self.mock_sender = self.mox.CreateMock(self.orig_sender)
self.mock_receiver = self.mox.CreateMock(self.orig_receiver)
self.mock_connection.opened().AndReturn(False)
self.mock_connection.open()
@@ -296,7 +285,7 @@ class RpcQpidTestCase(test.TestCase):
self.mock_session.close()
self.mock_connection.session().AndReturn(self.mock_session)
self.mocker.ReplayAll()
self.mox.ReplayAll()
try:
ctx = context.RequestContext("user", "project")
@@ -313,8 +302,6 @@ class RpcQpidTestCase(test.TestCase):
self.assertEquals(list(res), ["foo", "bar", "baz"])
else:
self.assertEquals(res, "foo")
self.mocker.VerifyAll()
finally:
while impl_qpid.Connection.pool.free_items:
# Pull the mock connection object out of the connection pool so