Skip to content

Commit

Permalink
Restore jointcal's memoryTester and make it pass.
Browse files Browse the repository at this point in the history
Fix memory test name

del more in tearDown so it passes
  • Loading branch information
parejkoj committed May 5, 2017
1 parent cfb54d1 commit 7ba997d
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
4 changes: 4 additions & 0 deletions tests/jointcalTestBase.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@ def tearDown(self):
del self.oldWcsList
if getattr(self, 'jointcalTask', None) is not None:
del self.jointcalTask
if getattr(self, 'jointcalStatistics', None) is not None:
del self.jointcalStatistics
if getattr(self, 'config', None) is not None:
del self.config

def _prep_reference_loader(self, center, radius):
"""
Expand Down
5 changes: 2 additions & 3 deletions tests/test_jointcal_cfht.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,8 @@ def test_jointcalTask_2_visits(self):
self._testJointcalTask(2, dist_rms_relative, self.dist_rms_absolute, pa1, metrics=metrics)


# TODO: the memory test cases currently fail in jointcal. Filed as DM-6626.
# class MyMemoryTestCase(lsst.utils.tests.MemoryTestCase):
# pass
class MemoryTester(lsst.utils.tests.MemoryTestCase):
pass

if __name__ == "__main__":
lsst.utils.tests.init()
Expand Down
5 changes: 2 additions & 3 deletions tests/test_jointcal_decam.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,8 @@ def test_jointcalTask_2_visits(self):
self._testJointcalTask(2, relative_error, self.absolute_error, pa1, metrics=metrics)


# TODO: the memory test cases currently fail in jointcal. Filed as DM-6626.
# class MyMemoryTestCase(lsst.utils.tests.MemoryTestCase):
# pass
class MemoryTester(lsst.utils.tests.MemoryTestCase):
pass

if __name__ == "__main__":
lsst.utils.tests.init()
Expand Down
5 changes: 2 additions & 3 deletions tests/test_jointcal_hsc.py
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,8 @@ def test_jointcalTask_3_visits_no_photometry_min_measurements_3(self):
self._testJointcalTask(3, dist_rms_relative, self.dist_rms_absolute, pa1, metrics=metrics)


# TODO: the memory test cases currently fail in jointcal. Filed as DM-6626.
# class MyMemoryTestCase(lsst.utils.tests.MemoryTestCase):
# pass
class MemoryTester(lsst.utils.tests.MemoryTestCase):
pass

if __name__ == "__main__":
lsst.utils.tests.init()
Expand Down
5 changes: 2 additions & 3 deletions tests/test_jointcal_lsstSim.py
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,8 @@ def testJointcalTask_2_visits_no_photometry(self):
self.assertEqual(calib, blank_calib)


# TODO: the memory test cases currently fail in jointcal. Filed as DM-6626.
# class MyMemoryTestCase(lsst.utils.tests.MemoryTestCase):
# pass
class MemoryTester(lsst.utils.tests.MemoryTestCase):
pass


if __name__ == "__main__":
Expand Down

0 comments on commit 7ba997d

Please sign in to comment.