Skip to content

Commit

Permalink
py.test migration and pep8 clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
afausti authored and r-owen committed Aug 16, 2016
1 parent 6c6fc22 commit 3de6a57
Showing 1 changed file with 8 additions and 18 deletions.
26 changes: 8 additions & 18 deletions tests/testMatchOptimisticB.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import lsst.daf.base as dafBase
import lsst.afw.geom as afwGeom
import lsst.afw.table as afwTable
import lsst.utils.tests as utilsTests
import lsst.utils.tests
import lsst.afw.image as afwImage
import lsst.pex.exceptions as pexExcept
from lsst.meas.algorithms import LoadReferenceObjectsTask
Expand Down Expand Up @@ -240,24 +240,14 @@ def testArgumentErrors(self):
)


#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
class MemoryTester(lsst.utils.tests.MemoryTestCase):
pass


def suite():
"""Returns a suite containing all the test cases in this module."""
utilsTests.init()

suites = []
suites += unittest.makeSuite(TestMatchOptimisticB)
suites += unittest.makeSuite(utilsTests.MemoryTestCase)

return unittest.TestSuite(suites)


def run(exit=False):
"""Run the tests"""
utilsTests.run(suite(), exit)

def setup_module(module):
lsst.utils.tests.init()

if __name__ == "__main__":
run(True)

lsst.utils.tests.init()
unittest.main()

0 comments on commit 3de6a57

Please sign in to comment.