Merge pull request #90 from lsst/tickets/DM-14612

DM-14612 Fix possible race condition on file delete

tests/test_jointcal_cfht_minimal.py

@@ -2,7 +2,6 @@
 import inspect
 import unittest
 import os
-import contextlib
 
 import lsst.afw.geom
 import lsst.utils
@@ -45,14 +44,6 @@ def setUp(self):
                         other_args=other_args,
                         do_plot=do_plot, log_level="debug")
 
-    def tearDown(self):
-        super()
-        with contextlib.suppress(FileNotFoundError):
-            os.remove("photometry_preinit-mat.txt")
-            os.remove("photometry_preinit-grad.txt")
-            os.remove("photometry_postinit-mat.txt")
-            os.remove("photometry_postinit-grad.txt")
-
     def test_jointcalTask_2_visits_photometry(self):
         self.config = lsst.jointcal.jointcal.JointcalConfig()
         self.config.photometryRefObjLoader.retarget(LoadAstrometryNetObjectsTask)
@@ -77,9 +68,13 @@ def test_jointcalTask_2_visits_photometry(self):
 
         # Check that the Hessian/gradient files were written.
         self.assertTrue(os.path.exists("photometry_preinit-mat.txt"))
+        os.remove("photometry_preinit-mat.txt")
         self.assertTrue(os.path.exists("photometry_preinit-grad.txt"))
+        os.remove("photometry_preinit-grad.txt")
         self.assertTrue(os.path.exists("photometry_postinit-mat.txt"))
+        os.remove("photometry_postinit-mat.txt")
         self.assertTrue(os.path.exists("photometry_postinit-grad.txt"))
+        os.remove("photometry_postinit-grad.txt")
 
     def test_jointcalTask_fails_raise(self):
         """Raise an exception if there is no data to process."""