Switched to use nose to run tests. Added test and bench functions to all modules.

1 files changed, 15 insertions, 13 deletions

diff --git a/numpy/lib/tests/test_getlimits.py b/numpy/lib/tests/test_getlimits.py
index a85228689..a6be8abd2 100644
--- a/numpy/lib/tests/test_getlimits.py
+++ b/numpy/lib/tests/test_getlimits.py
@@ -2,39 +2,40 @@
 """
 
 from numpy.testing import *
-import numpy.lib;reload(numpy.lib)
+import numpy.lib
+reload(numpy.lib)
 from numpy.lib.getlimits import finfo, iinfo
 from numpy import single,double,longdouble
 import numpy as np
 
 ##################################################
 
-class TestPythonFloat(NumpyTestCase):
-    def check_singleton(self):
+class TestPythonFloat(TestCase):
+    def test_singleton(self):
         ftype = finfo(float)
         ftype2 = finfo(float)
         assert_equal(id(ftype),id(ftype2))
 
-class TestSingle(NumpyTestCase):
-    def check_singleton(self):
+class TestSingle(TestCase):
+    def test_singleton(self):
         ftype = finfo(single)
         ftype2 = finfo(single)
         assert_equal(id(ftype),id(ftype2))
 
-class TestDouble(NumpyTestCase):
-    def check_singleton(self):
+class TestDouble(TestCase):
+    def test_singleton(self):
         ftype = finfo(double)
         ftype2 = finfo(double)
         assert_equal(id(ftype),id(ftype2))
 
-class TestLongdouble(NumpyTestCase):
-    def check_singleton(self,level=2):
+class TestLongdouble(TestCase):
+    def test_singleton(self,level=2):
         ftype = finfo(longdouble)
         ftype2 = finfo(longdouble)
         assert_equal(id(ftype),id(ftype2))
 
-class TestIinfo(NumpyTestCase):
-    def check_basic(self):
+class TestIinfo(TestCase):
+    def test_basic(self):
         dts = zip(['i1', 'i2', 'i4', 'i8',
                    'u1', 'u2', 'u4', 'u8'],
                   [np.int8, np.int16, np.int32, np.int64,
@@ -44,10 +45,11 @@ class TestIinfo(NumpyTestCase):
             assert_equal(iinfo(dt1).max, iinfo(dt2).max)
         self.assertRaises(ValueError, iinfo, 'f4')
 
-    def check_unsigned_max(self):
+    def test_unsigned_max(self):
         types = np.sctypes['uint']
         for T in types:
             assert_equal(iinfo(T).max, T(-1))
 
+
 if __name__ == "__main__":
-    NumpyTest().run()
+    nose.run(argv=['', __file__])