Update testButler.py for py.test

tests/testButler.py

@@ -30,12 +30,11 @@
 import unittest
 import warnings
 from lsst.utils import getPackageDir
-import lsst.utils.tests as utilsTests
+import lsst.utils.tests
 import lsst.daf.persistence as dafPersist
 import lsst.afw.cameraGeom as cameraGeom
 import lsst.afw.cameraGeom.utils as cameraGeomUtils
 import lsst.pex.exceptions as pexExcept
-import lsst.utils.tests
 from lsst.daf.base import DateTime
 from lsst.afw.image import RotType_UNKNOWN
 from lsst.afw.coord import IcrsCoord, Coord
@@ -161,22 +160,16 @@ def testPackageName(self):
         self.assertEqual(name, "obs_cfht")
 
 
-def suite():
-    """Returns a suite containing all the test cases in this module."""
-
-    utilsTests.init()
+def setup_module(module):
+    lsst.utils.tests.init()
 
-    suites = []
-    suites += unittest.makeSuite(GetRawTestCase)
-    suites += unittest.makeSuite(utilsTests.MemoryTestCase)
-    return unittest.TestSuite(suites)
 
+class MemoryTester(lsst.utils.tests.MemoryTestCase):
+    pass
 
-def run(shouldExit=False):
-    """Run the tests"""
-    utilsTests.run(suite(), shouldExit)
 
 if __name__ == "__main__":
     if "--display" in sys.argv:
         display = True
-    run(True)
+    lsst.utils.tests.init()
+    unittest.main()

tests/testColorterms.py

@@ -27,8 +27,6 @@
 import lsst.utils.tests
 import lsst.pipe.tasks.photoCal as photoCal
 
-def setup_module(module):
-    lsst.utils.tests.init()
 
 class ColortermOverrideTestCase(unittest.TestCase):
 
@@ -51,6 +49,11 @@ def testColorterms(self):
             self.assertIsInstance(ct.c1, numbers.Number)
             self.assertIsInstance(ct.c2, numbers.Number)
 
+
+def setup_module(module):
+    lsst.utils.tests.init()
+
+
 class MemoryTester(lsst.utils.tests.MemoryTestCase):
     pass