DM-12848: ap_verify unit tests fail on lsst-dev

tests/test_profiling.py

@@ -24,48 +24,88 @@
 
 import unittest
 
+import numpy as np
 import astropy.units as u
 
-from lsst.ip.isr import IsrTask
 import lsst.utils.tests
-from lsst.verify import Measurement
+import lsst.afw.image as afwImage
+from lsst.ip.isr import FringeTask
+import lsst.verify
 from lsst.ap.verify.measurements.profiling import measureRuntime
 
 
+def _createFringe(width, height, filterName):
+    """Create a fringe frame
+
+    Parameters
+    ----------
+    width, height: `int`
+        Size of image
+    filterName: `str`
+        name of the filterName to use
+
+    Returns
+    -------
+    fringe: `lsst.afw.image.ExposureF`
+        Fringe frame
+    """
+    image = afwImage.ImageF(width, height)
+    array = image.getArray()
+    freq = np.pi / 10.0
+    x, y = np.indices(array.shape)
+    array[x, y] = np.sin(freq * x) + np.sin(freq * y)
+    exp = afwImage.makeExposure(afwImage.makeMaskedImage(image))
+    exp.setFilter(afwImage.Filter(filterName))
+    return exp
+
+
 class MeasureRuntimeTestSuite(lsst.utils.tests.TestCase):
 
     def setUp(self):
-        self.task = IsrTask()
-        try:
-            self.task.run(ccdExposure=None)
-        except AttributeError:
-            # I wanted the run to fail...
-            pass
+        """Run a dummy instance of `FringeTask` so that test cases can measure it.
+        """
+        # Create dummy filter and fringe so that `FringeTask` has short but
+        # significant run time.
+        # Code adapted from lsst.ip.isr.test_fringes
+        size = 128
+        dummyFilter = 'FILTER'
+        afwImage.utils.defineFilter(dummyFilter, lambdaEff=0)
+        exp = _createFringe(size, size, dummyFilter)
+
+        # Create and run `FringeTask` itself
+        config = FringeTask.ConfigClass()
+        config.filters = [dummyFilter]
+        config.num = 1000
+        config.small = 1
+        config.large = size // 4
+        config.pedestal = False
+        self.task = FringeTask(name="fringe", config=config)
+        self.task.run(exp, exp)
 
     def tearDown(self):
         del self.task
 
     def testValid(self):
         """Verify that timing information can be recovered.
         """
-        meas = measureRuntime(self.task.getFullMetadata(), taskName='isr', metricName='ip_isr.IsrTime')
-        self.assertIsInstance(meas, Measurement)
+        meas = measureRuntime(self.task.getFullMetadata(), taskName='fringe', metricName='ip_isr.IsrTime')
+        self.assertIsInstance(meas, lsst.verify.Measurement)
         self.assertEqual(meas.metric_name, lsst.verify.Name(metric='ip_isr.IsrTime'))
         self.assertGreater(meas.quantity, 0.0 * u.second)
-        # The Task didn't actually do anything, so it should be short
-        self.assertLess(meas.quantity, 1.0 * u.second)
+        # Task normally takes 0.2 s, so this should be a safe margin of error
+        self.assertLess(meas.quantity, 10.0 * u.second)
 
     def testNoMetric(self):
         """Verify that trying to measure a nonexistent metric fails.
         """
         with self.assertRaises(TypeError):
-            measureRuntime(self.task.getFullMetadata(), taskName='isr', metricName='foo.bar.FooBarTime')
+            measureRuntime(self.task.getFullMetadata(), taskName='fringe', metricName='foo.bar.FooBarTime')
 
     def testNotRun(self):
         """Verify that trying to measure a real but inapplicable metric returns None.
         """
-        notRun = IsrTask(IsrTask.ConfigClass())
-        meas = measureRuntime(notRun.getFullMetadata(), taskName='isr', metricName='ip_isr.IsrTime')
+        notRun = FringeTask(name="fringe", config=FringeTask.ConfigClass())
+        meas = measureRuntime(notRun.getFullMetadata(), taskName='fringe', metricName='ip_isr.IsrTime')
         self.assertIsNone(meas)
 
 

ups/ap_verify.cfg

@@ -1,12 +1,12 @@
-# -*- python -*-
-
-import lsst.sconsUtils
-
-dependencies = {
-}
-
-config = lsst.sconsUtils.Configuration(
-    __file__,
-    hasDoxygenInclude=False,
-    hasSwigFiles=False,
+# -*- python -*-
+
+import lsst.sconsUtils
+
+dependencies = {
+}
+
+config = lsst.sconsUtils.Configuration(
+    __file__,
+    hasDoxygenInclude=False,
+    hasSwigFiles=False,
 )

ups/ap_verify.table

@@ -1,13 +1,15 @@
-setupRequired(python)
-setupRequired(python_future)
-
-setupRequired(utils)
-setupRequired(daf_persistence)
-
-setupRequired(verify)
-setupRequired(ap_pipe)
-
-setupOptional(ap_verify_hits2015)
-
-envPrepend(PYTHONPATH, ${PRODUCT_DIR}/python)
+setupRequired(python)
+setupRequired(python_future)
+
+setupRequired(utils)
+setupRequired(afw)
+setupRequired(daf_persistence)
+setupRequired(ip_isr)
+
+setupRequired(verify)
+setupRequired(ap_pipe)
+
+setupOptional(ap_verify_hits2015)
+
+envPrepend(PYTHONPATH, ${PRODUCT_DIR}/python)
 envPrepend(PATH, ${PRODUCT_DIR}/bin)