Author: dreiss
Date: Fri Oct 17 12:30:35 2008
New Revision: 705734
URL: http://svn.apache.org/viewvc?rev=705734&view=rev
Log:
THRIFT-109. python: Use self.assert* instead of assert in tests
Modified:
incubator/thrift/trunk/test/py/SerializationTest.py
incubator/thrift/trunk/test/py/TestSocket.py
Modified: incubator/thrift/trunk/test/py/SerializationTest.py
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/test/py/SerializationTest.py?rev=705734&r1=705733&r2=705734&view=diff
==============================================================================
--- incubator/thrift/trunk/test/py/SerializationTest.py (original)
+++ incubator/thrift/trunk/test/py/SerializationTest.py Fri Oct 17 12:30:35 2008
@@ -48,13 +48,13 @@
def testForwards(self):
obj = self._deserialize(VersioningTestV2, self._serialize(self.v1obj))
- assert obj.begin_in_both == self.v1obj.begin_in_both
- assert obj.end_in_both == self.v1obj.end_in_both
+ self.assertEquals(obj.begin_in_both, self.v1obj.begin_in_both)
+ self.assertEquals(obj.end_in_both, self.v1obj.end_in_both)
def testBackwards(self):
obj = self._deserialize(VersioningTestV1, self._serialize(self.v2obj))
- assert obj.begin_in_both == self.v2obj.begin_in_both
- assert obj.end_in_both == self.v2obj.end_in_both
+ self.assertEquals(obj.begin_in_both, self.v2obj.begin_in_both)
+ self.assertEquals(obj.end_in_both, self.v2obj.end_in_both)
class NormalBinaryTest(AbstractTest):
Modified: incubator/thrift/trunk/test/py/TestSocket.py
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/test/py/TestSocket.py?rev=705734&r1=705733&r2=705734&view=diff
==============================================================================
--- incubator/thrift/trunk/test/py/TestSocket.py (original)
+++ incubator/thrift/trunk/test/py/TestSocket.py Fri Oct 17 12:30:35 2008
@@ -40,7 +40,7 @@
socket.open()
leaky.append(socket)
except:
- assert time.time() - starttime < 5.0
+ self.assert_(time.time() - starttime < 5.0)
def testWriteTimeout(self):
starttime = time.time()
@@ -54,7 +54,7 @@
socket.write("hi" * 100)
except:
- assert time.time() - starttime < 5.0
+ self.assert_(time.time() - starttime < 5.0)
suite = unittest.TestSuite()
loader = unittest.TestLoader()
