Update test files to use modern pytest compatible approach

tests/DbAuth.py

@@ -25,7 +25,7 @@
 
 import unittest
 
-import lsst.utils.tests as tests
+import lsst.utils.tests
 from lsst.daf.base import Citizen
 from lsst.daf.persistence import DbAuth
 from lsst.pex.policy import Policy
@@ -64,12 +64,13 @@ def testSetPolicy(self):
         self.assertEqual(DbAuth.password("lsst9.ncsa.uiuc.edu", "3306"),
                 "squirrel")
 
-def run():
-    tests.init()
-    suites = []
-    suites.append(unittest.makeSuite(DbAuthTestCase))
-    suites.append(unittest.makeSuite(tests.MemoryTestCase))
-    tests.run(unittest.TestSuite(suites))
+class TestMemory(lsst.utils.tests.MemoryTestCase):
+    pass
 
-if __name__ == '__main__':
-    run()
+
+def setup_module(module):
+    lsst.utils.tests.init()
+
+if __name__ == "__main__":
+    lsst.utils.tests.init()
+    unittest.main()

tests/DbStorage_1.py

@@ -26,6 +26,7 @@
 import sys
 import time
 
+import lsst.utils.tests
 import lsst.daf.persistence as dafPers
 import lsst.pex.policy
 
@@ -101,5 +102,14 @@ def testWriteRead(self):
 
         db.endTransaction()
 
-if __name__ == '__main__':
+
+class TestMemory(lsst.utils.tests.MemoryTestCase):
+    pass
+
+
+def setup_module(module):
+    lsst.utils.tests.init()
+
+if __name__ == "__main__":
+    lsst.utils.tests.init()
     unittest.main()

tests/DbStorage_2.py

@@ -27,6 +27,7 @@
 import sys
 import time
 
+import lsst.utils.tests
 import lsst.daf.persistence as dafPers
 import lsst.pex.policy
 
@@ -107,5 +108,14 @@ def testWriteRead(self):
 
         db.endTransaction()
 
-if __name__ == '__main__':
+
+class TestMemory(lsst.utils.tests.MemoryTestCase):
+    pass
+
+
+def setup_module(module):
+    lsst.utils.tests.init()
+
+if __name__ == "__main__":
+    lsst.utils.tests.init()
     unittest.main()

tests/LogicalLocation.py

@@ -28,6 +28,7 @@
 from lsst.daf.persistence import LogicalLocation
 from lsst.daf.base import PropertySet
 
+import lsst.utils.tests
 import lsst.pex.logging
 lsst.pex.logging.Trace_setVerbosity("daf.persistence.LogicalLocation", 10)
 
@@ -55,5 +56,14 @@ def testSubst(self):
         l = LogicalLocation("%(foo)%3d(y)", ad2)
         self.assertEqual(l.locString(), "baz2009")
 
-if __name__ == '__main__':
+
+class TestMemory(lsst.utils.tests.MemoryTestCase):
+    pass
+
+
+def setup_module(module):
+    lsst.utils.tests.init()
+
+if __name__ == "__main__":
+    lsst.utils.tests.init()
     unittest.main()

tests/Persistence_1.py

@@ -24,6 +24,7 @@
 import lsst.daf.base as dafBase
 import lsst.daf.persistence as dafPersist
 import lsst.pex.policy
+import lsst.utils.tests
 
 class DbPersistence1TestCase(unittest.TestCase):
 
@@ -57,5 +58,14 @@ def testPersistence1(self):
         self.assertTrue(rdp.exists("foo"))
         self.assertEqual(rdp.getInt("foo"), 3)
 
-if __name__ == '__main__':
+
+class TestMemory(lsst.utils.tests.MemoryTestCase):
+    pass
+
+
+def setup_module(module):
+    lsst.utils.tests.init()
+
+if __name__ == "__main__":
+    lsst.utils.tests.init()
     unittest.main()

tests/Persistence_2.py

@@ -25,6 +25,7 @@
 import lsst.daf.base as dafBase
 import lsst.daf.persistence as dafPersist
 import lsst.pex.policy as pexPolicy
+import lsst.utils.tests
 
 HOST = "lsst10.ncsa.uiuc.edu"
 PORT = "3306"
@@ -130,5 +131,14 @@ def test3(self):
         storageList.append(storage)
         persistence.persist(dp, storageList, additionalData)
 
-if __name__ == '__main__':
+
+class TestMemory(lsst.utils.tests.MemoryTestCase):
+    pass
+
+
+def setup_module(module):
+    lsst.utils.tests.init()
+
+if __name__ == "__main__":
+    lsst.utils.tests.init()
     unittest.main()

tests/butlerAlias.py

@@ -24,7 +24,7 @@
 
 from __future__ import print_function
 import lsst.daf.persistence as dafPersist
-import lsst.utils.tests as utilsTests
+import lsst.utils.tests
 import os
 import pickle
 import pyfits
@@ -135,16 +135,14 @@ def testBadlyFormattedAlias(self):
         with self.assertRaises(RuntimeError):
             self.butler.defineAlias('abc@xyz', 'calexp')
 
-def suite():
-    utilsTests.init()
 
-    suites = []
-    suites += unittest.makeSuite(ButlerTestCase)
-    suites += unittest.makeSuite(utilsTests.MemoryTestCase)
-    return unittest.TestSuite(suites)
+class TestMemory(lsst.utils.tests.MemoryTestCase):
+    pass
 
-def run(shouldExit = False):
-    utilsTests.run(suite(), shouldExit)
 
-if __name__ == '__main__':
-    run(True)
+def setup_module(module):
+    lsst.utils.tests.init()
+
+if __name__ == "__main__":
+    lsst.utils.tests.init()
+    unittest.main()

tests/butlerPickle.py

@@ -25,7 +25,7 @@
 
 import pickle
 import unittest
-import lsst.utils.tests as utilsTests
+import lsst.utils.tests
 
 import lsst.daf.persistence as dafPersist
 
@@ -65,16 +65,14 @@ def testPickle(self):
         bbox = [[1, 2], [8, 9]]
         self.checkIO(butler, bbox, 1)
 
-def suite():
-    utilsTests.init()
 
-    suites = []
-    suites += unittest.makeSuite(ButlerPickleTestCase)
-    suites += unittest.makeSuite(utilsTests.MemoryTestCase)
-    return unittest.TestSuite(suites)
+class TestMemory(lsst.utils.tests.MemoryTestCase):
+    pass
 
-def run(shouldExit = False):
-    utilsTests.run(suite(), shouldExit)
 
-if __name__ == '__main__':
-    run(True)
+def setup_module(module):
+    lsst.utils.tests.init()
+
+if __name__ == "__main__":
+    lsst.utils.tests.init()
+    unittest.main()

tests/dataId.py

@@ -74,9 +74,12 @@ def testInputDataId(self):
         self.assertEqual(dataId, {'a':1, 'b':2})
         self.assertEqual(dataId.tag, set(['foo', 'bar', 'baz']))
 
+
 class MemoryTester(lsst.utils.tests.MemoryTestCase):
     pass
 
+def setup_module(module):
+    lsst.utils.tests.init()
 
 if __name__ == '__main__':
     lsst.utils.tests.init()

tests/mapper.py

@@ -24,7 +24,7 @@
 
 
 import unittest
-import lsst.utils.tests as utilsTests
+import lsst.utils.tests
 
 import lsst.daf.persistence as dafPersist
 
@@ -94,16 +94,14 @@ def testStandardize(self):
         self.assertEqual(isinstance(result, float), True)
         self.assertEqual(result, 3.14)
 
-def suite():
-    utilsTests.init()
 
-    suites = []
-    suites += unittest.makeSuite(MapperTestCase)
-    suites += unittest.makeSuite(utilsTests.MemoryTestCase)
-    return unittest.TestSuite(suites)
+class TestMemory(lsst.utils.tests.MemoryTestCase):
+    pass
 
-def run(shouldExit = False):
-    utilsTests.run(suite(), shouldExit)
 
-if __name__ == '__main__':
-    run(True)
+def setup_module(module):
+    lsst.utils.tests.init()
+
+if __name__ == "__main__":
+    lsst.utils.tests.init()
+    unittest.main()

tests/mapperImport.py

@@ -27,7 +27,7 @@
 import pickle
 import shutil
 import unittest
-import lsst.utils.tests as utilsTests
+import lsst.utils.tests
 
 import lsst.daf.persistence as dafPersist
 import pickleMapper
@@ -66,16 +66,14 @@ def testPickle(self):
         bbox = [[1, 2], [8, 9]]
         self.checkIO(butler, bbox, 1)
 
-def suite():
-    utilsTests.init()
 
-    suites = []
-    suites += unittest.makeSuite(MapperImportTestCase)
-    suites += unittest.makeSuite(utilsTests.MemoryTestCase)
-    return unittest.TestSuite(suites)
+class TestMemory(lsst.utils.tests.MemoryTestCase):
+    pass
 
-def run(shouldExit = False):
-    utilsTests.run(suite(), shouldExit)
 
-if __name__ == '__main__':
-    run(True)
+def setup_module(module):
+    lsst.utils.tests.init()
+
+if __name__ == "__main__":
+    lsst.utils.tests.init()
+    unittest.main()

tests/repository.py

@@ -34,7 +34,6 @@
 
 import yaml
 
-import lsst.utils.tests as utilsTests
 import lsst.daf.persistence as dp
 from lsst.daf.persistence import Policy
 import lsst.utils.tests

tests/repositoryCfg.py

@@ -131,6 +131,10 @@ def test(self):
 class MemoryTester(lsst.utils.tests.MemoryTestCase):
     pass
 
+
+def setup_module(module):
+    lsst.utils.tests.init()
+
 if __name__ == '__main__':
     lsst.utils.tests.init()
     unittest.main()

tests/testFsScanner.py

@@ -23,7 +23,7 @@
 #
 
 import unittest
-import lsst.utils.tests as utilsTests
+import lsst.utils.tests
 from lsst.daf.persistence import FsScanner
 
 
@@ -41,15 +41,14 @@ def test2(self):
         res = scanner.processPath('tests/testFsScanner')
         self.assertEqual(res, {'raw_v1_fg.fits.gz': {'visit': 1, 'filter': 'g'}})
 
-def suite():
-    utilsTests.init()
 
-    suites = []
-    suites += unittest.makeSuite(FsScannerTestCase)
-    return unittest.TestSuite(suites)
+class TestMemory(lsst.utils.tests.MemoryTestCase):
+    pass
 
-def run(shouldExit = False):
-    utilsTests.run(suite(), shouldExit)
 
-if __name__ == '__main__':
-    run(True)
+def setup_module(module):
+    lsst.utils.tests.init()
+
+if __name__ == "__main__":
+    lsst.utils.tests.init()
+    unittest.main()

tests/testPolicy.py

@@ -26,7 +26,7 @@
 import unittest
 
 from lsst.daf.persistence import Policy
-import lsst.utils.tests as utilsTests
+import lsst.utils.tests
 
 
 class PolicyTestCase(unittest.TestCase):
@@ -125,16 +125,14 @@ def testNonExistantPolicyAtPath(self):
         self.assertRaises(IOError, Policy, filePath="c:/policy.paf")
         self.assertRaises(IOError, Policy, filePath="c:/policy")
 
-def suite():
-    utilsTests.init()
 
-    suites = []
-    suites += unittest.makeSuite(PolicyTestCase)
-    suites += unittest.makeSuite(utilsTests.MemoryTestCase)
-    return unittest.TestSuite(suites)
+class TestMemory(lsst.utils.tests.MemoryTestCase):
+    pass
 
-def run(shouldExit = False):
-    utilsTests.run(suite(), shouldExit)
 
-if __name__ == '__main__':
-    run(True)
+def setup_module(module):
+    lsst.utils.tests.init()
+
+if __name__ == "__main__":
+    lsst.utils.tests.init()
+    unittest.main()