[Neo-report] r2693 jm - in /trunk/neo/tests: ./ client/
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Mar 24 14:09:50 CET 2011
Author: jm
Date: Thu Mar 24 14:09:49 2011
New Revision: 2693
Log:
tests: Mock objects can't be passed to assert(Not)Equal
This fixes tests on Python 2.7
Modified:
trunk/neo/tests/__init__.py
trunk/neo/tests/client/testClientApp.py
trunk/neo/tests/testConnection.py
Modified: trunk/neo/tests/__init__.py
==============================================================================
--- trunk/neo/tests/__init__.py [iso-8859-1] (original)
+++ trunk/neo/tests/__init__.py [iso-8859-1] Thu Mar 24 14:09:49 2011
@@ -89,6 +89,18 @@ class NeoTestBase(unittest.TestCase):
sys.stdout.write('\n')
sys.stdout.flush()
+ def failUnlessEqual(self, first, second, msg=None):
+ assert not (isinstance(first, Mock) or isinstance(second, Mock)), \
+ "Mock objects can't be compared with '==' or '!='"
+ return super(NeoTestBase, self).failUnlessEqual(first, second, msg=msg)
+ assertEqual = assertEquals = failUnlessEqual
+
+ def failIfEqual(self, first, second, msg=None):
+ assert not (isinstance(first, Mock) or isinstance(second, Mock)), \
+ "Mock objects can't be compared with '==' or '!='"
+ return super(NeoTestBase, self).failIfEqual(first, second, msg=msg)
+ assertNotEqual = assertNotEquals = failIfEqual
+
class NeoUnitTestBase(NeoTestBase):
""" Base class for neo tests, implements common checks """
Modified: trunk/neo/tests/client/testClientApp.py
==============================================================================
--- trunk/neo/tests/client/testClientApp.py [iso-8859-1] (original)
+++ trunk/neo/tests/client/testClientApp.py [iso-8859-1] Thu Mar 24 14:09:49 2011
@@ -359,8 +359,7 @@ class ClientApplicationTests(NeoUnitTest
tid = self.makeTID()
txn = Mock()
# first, tid is supplied
- self.assertNotEquals(getattr(app, 'tid', None), tid)
- self.assertNotEquals(getattr(app, 'txn', None), txn)
+ self.assertTrue(app._txn_container.get(txn) is None)
packet = Packets.AnswerBeginTransaction(tid=tid)
packet.setId(0)
app.master_conn = Mock({
Modified: trunk/neo/tests/testConnection.py
==============================================================================
--- trunk/neo/tests/testConnection.py [iso-8859-1] (original)
+++ trunk/neo/tests/testConnection.py [iso-8859-1] Thu Mar 24 14:09:49 2011
@@ -145,9 +145,9 @@ class ConnectionTests(NeoUnitTestBase):
# init with connector
registerConnectorHandler(DoNothingConnector)
connector = getConnectorHandler("DoNothingConnector")()
- self.assertNotEqual(connector, None)
+ self.assertFalse(connector is None)
bc = self._makeConnection()
- self.assertNotEqual(bc.connector, None)
+ self.assertFalse(bc.connector is None)
self._checkRegistered(1)
def test_01_BaseConnection2(self):
@@ -659,12 +659,12 @@ class ConnectionTests(NeoUnitTestBase):
self.assertFalse(bc.isServer())
self._checkMakeClientConnection(1)
# check call to handler
- self.assertNotEqual(bc.getHandler(), None)
+ self.assertFalse(bc.getHandler() is None)
self._checkConnectionStarted(1)
self._checkConnectionCompleted(1)
self._checkConnectionFailed(0)
# check call to event manager
- self.assertNotEqual(bc.getEventManager(), None)
+ self.assertFalse(bc.getEventManager() is None)
self._checkReaderAdded(1)
self._checkWriterAdded(0)
@@ -683,12 +683,12 @@ class ConnectionTests(NeoUnitTestBase):
self.assertFalse(bc.isServer())
self._checkMakeClientConnection(1)
# check call to handler
- self.assertNotEqual(bc.getHandler(), None)
+ self.assertFalse(bc.getHandler() is None)
self._checkConnectionStarted(1)
self._checkConnectionCompleted(0)
self._checkConnectionFailed(0)
# check call to event manager
- self.assertNotEqual(bc.getEventManager(), None)
+ self.assertFalse(bc.getEventManager() is None)
self._checkReaderAdded(1)
self._checkWriterAdded(1)
More information about the Neo-report
mailing list