Revision: 371
http://rpy.svn.sourceforge.net/rpy/?rev=371&view=rev
Author: warnes
Date: 2007-11-13 07:41:25 -0800 (Tue, 13 Nov 2007)
Log Message:
-----------
Improve display of messages about tests being skipped (more)
Modified Paths:
--------------
trunk/rpy/tests/test_numeric.py
Modified: trunk/rpy/tests/test_numeric.py
===================================================================
--- trunk/rpy/tests/test_numeric.py 2007-11-13 15:37:49 UTC (rev 370)
+++ trunk/rpy/tests/test_numeric.py 2007-11-13 15:41:25 UTC (rev 371)
@@ -90,7 +90,7 @@
else:
a = array( [1,2,3], Int64 )
except:
- print "\nInt64 Not found. Skipping this test.\n"
+ print "\nInt64 not found (32 bit platform?), skipping this test.\n"
return
b = r.c(a)
@@ -131,22 +131,17 @@
if(ArrayLib=='NumPy'):
a = array( [1,2,3], 'Bool' )
else:
- print "\nBool arrays not supported by Numeric, skipping\n"
+ print "\nBool arrays not supported by Numeric, skipping this
test.\n"
return
b = r.c(a)
def test64BitFloatArray(self):
- # 64 bit ints
- try:
- if(ArrayLib=='NumPy'):
- a = array( [1,2,3], 'Float64' )
- else:
- a = array( [1,2,3], Float64 )
- except:
- print "\nFloat64 Not found. Skipping this test.\n"
- return
+ if(ArrayLib=='NumPy'):
+ a = array( [1,2,3], 'Float64' )
+ else:
+ a = array( [1,2,3], Float64 )
b = r.c(a)
@@ -175,7 +170,7 @@
if(ArrayLib=='NumPy'):
a = array( ['ABCDEFHIJKLM', 'B', 'C C C'], 'S10' )
else: # not available on Numeric
- print "\nString arrays not supported by Numeric, skipping\n"
+ print "\nString arrays not supported by Numeric, skipping this
test.\n"
return
self.failUnlessRaises(RPyTypeConversionException, lambda: r.c(a) )
@@ -201,7 +196,7 @@
else:
a = array( [1,2,3], Int64 )
except:
- print "\nInt64 Not found. Skipping this test.\n"
+ print "\nInt64 not found (32 bit platform?), skipping this test.\n"
return
b = r.c(a[0])
@@ -242,28 +237,22 @@
if(ArrayLib=='NumPy'):
a = array( [1,2,3], 'Bool' )
else:
- print "\nBool arrays not supported by Numeric, skipping\n"
+ print "\nBool arrays not supported by Numeric, skipping this
test.\n"
return
b = r.c(a[0])
def test64BitFloatScalar(self):
- # 64 bit ints
- try:
- if(ArrayLib=='NumPy'):
- a = array( [1,2,3], 'Float64' )
- else:
- a = array( [1,2,3], Float64 )
- except:
- print "\nFloat64 Not found. Skipping this test.\n"
- return
-
+ if(ArrayLib=='NumPy'):
+ a = array( [1,2,3], 'Float64' )
+ else:
+ a = array( [1,2,3], Float64 )
+
b = r.c(a[0])
def test32BitFloatScalar(self):
- # 32 bit ints
if(ArrayLib=='NumPy'):
a = array( [1,2,3], 'Float32' )
else:
@@ -289,7 +278,7 @@
self.failUnless( r.c(a[0])=='ABCDEFHIJK' )
else:
# String class not available on Numeric
- print "\nString arrays not supported by Numeric, skipping\n"
+ print "\nString arrays not supported by Numeric, skipping this
test.\n"
return
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
rpy-list mailing list
rpy-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rpy-list
