Revision: 475
http://rpy.svn.sourceforge.net/rpy/?rev=475&view=rev
Author: warnes
Date: 2008-04-03 16:26:50 -0700 (Thu, 03 Apr 2008)
Log Message:
-----------
Use failUnless / failUnlessRaises instead of assertTrue / assertRaises in
test_robj.py for compatibility with python 2.3
Modified Paths:
--------------
trunk/rpy/tests/test_robj.py
Modified: trunk/rpy/tests/test_robj.py
===================================================================
--- trunk/rpy/tests/test_robj.py 2008-03-30 19:34:18 UTC (rev 474)
+++ trunk/rpy/tests/test_robj.py 2008-04-03 23:26:50 UTC (rev 475)
@@ -25,26 +25,26 @@
pySeq = range(10, 50+step, step)
d = r.seq(10, 50, by = step)
for i in range(len(pySeq)):
- self.assertTrue(pySeq[i] == d[i])
- self.assertTrue(pySeq[-1] == d[-1])
+ self.failUnless(pySeq[i] == d[i])
+ self.failUnless(pySeq[-1] == d[-1])
def testGetItemSlice(self):
r.seq.autoconvert(NO_CONVERSION)
step = 10
pySeq = range(10, 50+step, step)
d = r.seq(10, 50, by=step)
- self.assertTrue(pySeq[0:4] == d[0:4])
- self.assertTrue(pySeq[:4] == d[:4])
- self.assertTrue(pySeq[1:] == d[1:])
- self.assertTrue(pySeq[2:5] == d[2:5])
+ self.failUnless(pySeq[0:4] == d[0:4])
+ self.failUnless(pySeq[:4] == d[:4])
+ self.failUnless(pySeq[1:] == d[1:])
+ self.failUnless(pySeq[2:5] == d[2:5])
# FIXME:
# The one below deserves attention: a one-element slice
# should return a one-element sequence.
# However, the conversion system in RPy is making it
# somewhat problematic (or is it me ?)-- Laurent
- # self.assertTrue(pySeq[0:1] == d[0:1])
- self.assertRaises(IndexError, d.__getslice__, -1, 2)
- self.assertRaises(IndexError, d.__getslice__, 5, 2)
+ # self.failUnless(pySeq[0:1] == d[0:1])
+ self.failUnlessRaises(IndexError, d.__getslice__, -1, 2)
+ self.failUnlessRaises(IndexError, d.__getslice__, 5, 2)
def testKeywordParameters(self):
r.list.autoconvert(BASIC_CONVERSION)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
rpy-list mailing list
rpy-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rpy-list
