[Scipy-svn] r3725 - branches/testing_cleanup/scipy/sandbox/exmplpackage/tests

[scipy-svn at scipy.org]

Author: fperez
Date: 2007-12-27 01:48:58 -0600 (Thu, 27 Dec 2007)
New Revision: 3725

Added:
   branches/testing_cleanup/scipy/sandbox/exmplpackage/tests/tstsupport.py
Modified:
   branches/testing_cleanup/scipy/sandbox/exmplpackage/tests/test_foo.py
Log:
Further cleanup

Modified: branches/testing_cleanup/scipy/sandbox/exmplpackage/tests/test_foo.py
===================================================================
--- branches/testing_cleanup/scipy/sandbox/exmplpackage/tests/test_foo.py	2007-12-27 07:45:58 UTC (rev 3724)
+++ branches/testing_cleanup/scipy/sandbox/exmplpackage/tests/test_foo.py	2007-12-27 07:48:58 UTC (rev 3725)
@@ -23,14 +23,10 @@
 will *exclude* all slow tests from a run.
 """
 
-from numpy.testing import NumpyTestCase
+# This single import statement should provide all the common functionality for
+# scipy tests in a single location.
+from tstsupport import *
 
-import nose
-
-# These two modules will need to be later put in the right places...
-from ntest import NumpyTestCase2
-import decorators as dec
-
 def setup():
     """Module-level setup"""
     print 'doing setup'
@@ -40,7 +36,7 @@
     print 'doing teardown'
 
 
-class ClassicTest(NumpyTestCase2):
+class ClassicTest(TestCase):
     """A regular unittest, with the extra Numpy features."""
     def test_1(self):
         print 'First test'

Added: branches/testing_cleanup/scipy/sandbox/exmplpackage/tests/tstsupport.py
===================================================================
--- branches/testing_cleanup/scipy/sandbox/exmplpackage/tests/tstsupport.py	2007-12-27 07:45:58 UTC (rev 3724)
+++ branches/testing_cleanup/scipy/sandbox/exmplpackage/tests/tstsupport.py	2007-12-27 07:48:58 UTC (rev 3725)
@@ -0,0 +1,13 @@
+"""Common test support for all scipy test scripts.
+
+This single module should provide all the common functionality for scipy tests
+in a single location, so that test script can just import it and work right
+away.
+"""
+
+import nose
+
+# These two modules will need to be later put in the right places...
+import decorators as dec
+
+from ntest import *