Added try-excepts to all product retrieval tests to catch NoProductAvailableErrors and instead record them as test failures.

Signed-off-by: David Turner <djturner@umbc.edu>

Author: David Turner

tests/test_generate/test_ciao_phot.py

@@ -1,11 +1,11 @@
 #  This code is part of X-ray: Generate and Analyse (XGA), a module designed for the XMM Cluster Survey (XCS).
-#  Last modified by David J Turner (djturner@umbc.edu) 4/27/26, 5:17 PM. Copyright (c) The Contributors.
+#  Last modified by David J Turner (djturner@umbc.edu) 5/10/26, 7:14 PM. Copyright (c) The Contributors.
 
 import unittest
 
 from astropy.units import Quantity
 
-from xga.exceptions import TelescopeNotAssociatedError
+from xga.exceptions import TelescopeNotAssociatedError, NoProductAvailableError
 from xga.generate.ciao.phot import chandra_image_expmap
 from xga.products import Image
 from .. import get_test_source
@@ -41,20 +41,20 @@ def test_chandra_image_expmap_if_available(self):
         try:
             im = self.src.get_images(lo_en=Quantity(0.5, 'keV'), hi_en=Quantity(2.0, 'keV'),
                                          telescope='chandra')
-            if isinstance(im, list):
-                for i in im:
-                    assert i.telescope == 'chandra'
-                    assert i.energy_bounds[0] == Quantity(0.5, 'keV')
-                    assert i.energy_bounds[1] == Quantity(2.0, 'keV')
-                    assert isinstance(i, Image)
-            else:
-                assert im.telescope == 'chandra'
-                assert im.energy_bounds[0] == Quantity(0.5, 'keV')
-                assert im.energy_bounds[1] == Quantity(2.0, 'keV')
-                assert isinstance(im, Image)
-        except Exception:
-            # If retrieval fails, that's OK for now - at least generation didn't crash
-            pass
+        except NoProductAvailableError:
+            self.fail("NoProductAvailableError raised when retrieving Chandra images.")
+
+        if isinstance(im, list):
+            for i in im:
+                assert i.telescope == 'chandra'
+                assert i.energy_bounds[0] == Quantity(0.5, 'keV')
+                assert i.energy_bounds[1] == Quantity(2.0, 'keV')
+                assert isinstance(i, Image)
+        else:
+            assert im.telescope == 'chandra'
+            assert im.energy_bounds[0] == Quantity(0.5, 'keV')
+            assert im.energy_bounds[1] == Quantity(2.0, 'keV')
+            assert isinstance(im, Image)
 
 
 if __name__ == "__main__":

tests/test_generate/test_ciao_spec.py

@@ -1,9 +1,9 @@
 #  This code is part of X-ray: Generate and Analyse (XGA), a module designed for the XMM Cluster Survey (XCS).
-#  Last modified by David J Turner (djturner@umbc.edu) 4/27/26, 5:17 PM. Copyright (c) The Contributors.
+#  Last modified by David J Turner (djturner@umbc.edu) 5/10/26, 7:14 PM. Copyright (c) The Contributors.
 
 import unittest
 
-from xga.exceptions import TelescopeNotAssociatedError
+from xga.exceptions import TelescopeNotAssociatedError, NoProductAvailableError
 from xga.generate.ciao.spec import specextract_spectrum
 from xga.products import Spectrum
 from .. import get_test_source
@@ -38,16 +38,16 @@ def test_specextract_spectrum_if_available(self):
         # Try to retrieve the generated products
         try:
             spec = self.src.get_spectra('r500', telescope='chandra')
-            if isinstance(spec, list):
-                for s in spec:
-                    assert s.telescope == 'chandra'
-                    assert isinstance(s, Spectrum)
-            else:
-                assert spec.telescope == 'chandra'
-                assert isinstance(spec, Spectrum)
-        except Exception:
-            # If retrieval fails, that's OK for now - at least generation didn't crash
-            pass
+        except NoProductAvailableError:
+            self.fail("NoProductAvailableError raised when retrieving Chandra spectra.")
+
+        if isinstance(spec, list):
+            for s in spec:
+                assert s.telescope == 'chandra'
+                assert isinstance(s, Spectrum)
+        else:
+            assert spec.telescope == 'chandra'
+            assert isinstance(spec, Spectrum)
 
 
 if __name__ == "__main__":

tests/test_generate/test_esass_phot.py

@@ -1,5 +1,5 @@
 #  This code is part of X-ray: Generate and Analyse (XGA), a module designed for the XMM Cluster Survey (XCS).
-#  Last modified by David J Turner (djturner@umbc.edu) 5/10/26, 6:19 PM. Copyright (c) The Contributors.
+#  Last modified by David J Turner (djturner@umbc.edu) 5/10/26, 6:49 PM. Copyright (c) The Contributors.
 
 import unittest
 
@@ -102,8 +102,11 @@ def test_expmap(self):
     def test_expmap_combined_obs(self):
         expmap(self.src, Quantity(0.5, 'keV'), Quantity(3, 'keV'), combine_obs=True)
 
-        exp = self.src.get_combined_expmaps(lo_en=Quantity(0.5, 'keV'), hi_en=Quantity(3, 'keV'),
-                                      telescope='erass')
+        try:
+            exp = self.src.get_combined_expmaps(lo_en=Quantity(0.5, 'keV'), hi_en=Quantity(3, 'keV'),
+                                          telescope='erass')
+        except NoProductAvailableError:
+            self.fail("NoProductAvailableError raised.")
 
         assert exp.telescope == 'erass'
         assert exp.energy_bounds[0] == Quantity(0.5, 'keV')

tests/test_generate/test_sas_phot.py

@@ -1,11 +1,11 @@
 #  This code is part of X-ray: Generate and Analyse (XGA), a module designed for the XMM Cluster Survey (XCS).
-#  Last modified by David J Turner (djturner@umbc.edu) 5/5/26, 11:56 PM. Copyright (c) The Contributors.
+#  Last modified by David J Turner (djturner@umbc.edu) 5/10/26, 7:14 PM. Copyright (c) The Contributors.
 
 import unittest
 
 from astropy.units import Quantity
 
-from xga.exceptions import TelescopeNotAssociatedError
+from xga.exceptions import TelescopeNotAssociatedError, NoProductAvailableError
 from xga.generate.sas.phot import evselect_image, eexpmap, emosaic
 from xga.products import Image, ExpMap
 from .. import get_test_source
@@ -34,8 +34,12 @@ def test_evselect_image_no_tel_error(self):
     def test_evselect_image(self):
         evselect_image(self.src, Quantity(0.4, 'keV'), Quantity(3, 'keV'))
 
-        im = self.src.get_images(lo_en=Quantity(0.4, 'keV'), hi_en=Quantity(3, 'keV'), 
-                                      telescope='xmm')
+        try:
+            im = self.src.get_images(lo_en=Quantity(0.4, 'keV'), hi_en=Quantity(3, 'keV'),
+                                          telescope='xmm')
+        except NoProductAvailableError:
+            self.fail("NoProductAvailableError raised.")
+
         if isinstance(im, list):
             for i in im:
                 assert i.telescope == 'xmm'
@@ -52,8 +56,12 @@ def test_evselect_image(self):
     def test_eexpmap(self):
         eexpmap(self.src, Quantity(0.4, 'keV'), Quantity(3, 'keV'))
 
-        exp = self.src.get_expmaps(lo_en=Quantity(0.4, 'keV'), hi_en=Quantity(3, 'keV'), 
-                                       telescope='xmm')
+        try:
+            exp = self.src.get_expmaps(lo_en=Quantity(0.4, 'keV'), hi_en=Quantity(3, 'keV'),
+                                           telescope='xmm')
+        except NoProductAvailableError:
+            self.fail("NoProductAvailableError raised.")
+
         if isinstance(exp, list):
             for e in exp:
                 assert e.telescope == 'xmm'
@@ -70,13 +78,17 @@ def test_eexpmap(self):
     def test_emosaic_incorrect_input(self):
         with self.assertRaises(ValueError):
             emosaic(self.src, 'wrong')
-    
+
     @require_sas
     def test_emosaic_image(self):
         emosaic(self.src, 'image', lo_en=Quantity(0.4, 'keV'), hi_en=Quantity(3, 'keV'))
-        
-        im = self.src.get_combined_images(lo_en=Quantity(0.4, 'keV'), hi_en=Quantity(3, 'keV'), 
-                                               telescope='xmm')
+
+        try:
+            im = self.src.get_combined_images(lo_en=Quantity(0.4, 'keV'), hi_en=Quantity(3, 'keV'),
+                                                   telescope='xmm')
+        except NoProductAvailableError:
+            self.fail("NoProductAvailableError raised.")
+
         if isinstance(im, list):
             for i in im:
                 assert i.telescope == 'xmm'
@@ -93,9 +105,13 @@ def test_emosaic_image(self):
     @require_sas
     def test_emosaic_expmap(self):
         emosaic(self.src, 'expmap', lo_en=Quantity(0.4, 'keV'), hi_en=Quantity(3, 'keV'))
-        
-        exp = self.src.get_combined_expmaps(lo_en=Quantity(0.4, 'keV'), hi_en=Quantity(3, 'keV'), 
-                                               telescope='xmm')
+
+        try:
+            exp = self.src.get_combined_expmaps(lo_en=Quantity(0.4, 'keV'), hi_en=Quantity(3, 'keV'),
+                                                   telescope='xmm')
+        except NoProductAvailableError:
+            self.fail("NoProductAvailableError raised.")
+
         if isinstance(exp, list):
             for e in exp:
                 assert e.telescope == 'xmm'

tests/test_generate/test_sas_spec.py

@@ -1,10 +1,11 @@
 #  This code is part of X-ray: Generate and Analyse (XGA), a module designed for the XMM Cluster Survey (XCS).
-#  Last modified by David J Turner (djturner@umbc.edu) 4/27/26, 5:17 PM. Copyright (c) The Contributors.
+#  Last modified by David J Turner (djturner@umbc.edu) 5/10/26, 7:14 PM. Copyright (c) The Contributors.
 
 import unittest
 
 from astropy.units import Quantity
 
+from xga.exceptions import NoProductAvailableError
 from xga.generate.sas.lightcurve import evselect_lightcurve
 from xga.generate.sas.spec import evselect_spectrum, spectrum_set
 from xga.products import Spectrum, LightCurve, AnnularSpectra
@@ -21,7 +22,10 @@ def setUpClass(cls):
     def test_evselect_spectrum(self):
         evselect_spectrum(self.src, 'r500')
 
-        spec = self.src.get_spectra('r500', telescope='xmm')
+        try:
+            spec = self.src.get_spectra('r500', telescope='xmm')
+        except NoProductAvailableError:
+            self.fail("NoProductAvailableError raised.")
 
         if isinstance(spec, list):
             for sp in spec:
@@ -39,7 +43,11 @@ def test_spectrum_set(self):
         radii = Quantity([0, 100, 200, 500], 'kpc')
         spectrum_set(self.src, radii)
 
-        ann_spec = self.src.get_annular_spectra(radii, telescope='xmm')
+        try:
+            ann_spec = self.src.get_annular_spectra(radii, telescope='xmm')
+        except NoProductAvailableError:
+            self.fail("NoProductAvailableError raised.")
+
         assert isinstance(ann_spec, AnnularSpectra)
         assert ann_spec.telescope == 'xmm'
         assert len(ann_spec) == 3
@@ -51,7 +59,10 @@ def test_evselect_lightcurve(self):
         """
         evselect_lightcurve(self.src, 'r500')
 
-        lc = self.src.get_lightcurves('r500', telescope='xmm')
+        try:
+            lc = self.src.get_lightcurves('r500', telescope='xmm')
+        except NoProductAvailableError:
+            self.fail("NoProductAvailableError raised.")
 
         if isinstance(lc, list):
             for l in lc:

tests/test_sources/test_combined_products.py

@@ -1,5 +1,5 @@
 #  This code is part of X-ray: Generate and Analyse (XGA), a module designed for the XMM Cluster Survey (XCS).
-#  Last modified by David J Turner (djturner@umbc.edu) 5/5/26, 11:57 PM. Copyright (c) The Contributors.
+#  Last modified by David J Turner (djturner@umbc.edu) 5/10/26, 6:52 PM. Copyright (c) The Contributors.
 
 import unittest
 
@@ -45,8 +45,12 @@ def test_erass_multiobs_combined_inst_param(self):
             pass  # May not exist if TM1 not available
 
         # Retrieve multi-obs + combined inst
-        spec_comb = self.src.get_spectra(Quantity(500, 'kpc'), obs_id='combined', inst='combined',
-                                        group_spec=True, min_counts=5, telescope='erass')
+        try:
+            spec_comb = self.src.get_spectra(Quantity(500, 'kpc'), obs_id='combined', inst='combined',
+                                            group_spec=True, min_counts=5, telescope='erass')
+        except NoProductAvailableError:
+            self.fail("NoProductAvailableError raised when retrieving multi-obs combined eRASS spectrum.")
+
         assert spec_comb.obs_id == 'combined'
         assert spec_comb.instrument == 'combined'
 
@@ -68,16 +72,20 @@ def test_get_combined_spectra_wrapper_equivalence(self):
         try:
             spec_direct = self.src.get_spectra(Quantity(500, 'kpc'), obs_id='combined', inst='combined',
                                              group_spec=True, min_counts=5, telescope='erass')
+        except NoProductAvailableError:
+            self.fail("NoProductAvailableError raised by get_spectra(obs_id='combined')")
+
+        try:
             spec_wrapper = self.src.get_combined_spectra(Quantity(500, 'kpc'), inst='combined',
                                                        group_spec=True, min_counts=5, telescope='erass')
-
-            # Should be the same product
-            if not isinstance(spec_direct, list):
-                assert spec_direct.path == spec_wrapper.path
-            else:
-                assert len(spec_direct) == len(spec_wrapper)
         except NoProductAvailableError:
-            self.skipTest("Combined spectra not available")
+            self.fail("NoProductAvailableError raised by get_combined_spectra()")
+
+        # Should be the same product
+        if not isinstance(spec_direct, list):
+            assert spec_direct.path == spec_wrapper.path
+        else:
+            assert len(spec_direct) == len(spec_wrapper)
 
 
 if __name__ == "__main__":

tests/test_sources/test_loading.py

@@ -1,10 +1,11 @@
 #  This code is part of X-ray: Generate and Analyse (XGA), a module designed for the XMM Cluster Survey (XCS).
-#  Last modified by David J Turner (djturner@umbc.edu) 5/5/26, 11:36 PM. Copyright (c) The Contributors.
+#  Last modified by David J Turner (djturner@umbc.edu) 5/10/26, 7:14 PM. Copyright (c) The Contributors.
 
 import unittest
 
 from astropy.units import Quantity
 
+from xga.exceptions import NoProductAvailableError
 from xga.generate.ciao.phot import chandra_image_expmap
 from xga.generate.ciao.spec import specextract_spectrum
 from xga.generate.sas.phot import evselect_image, eexpmap
@@ -36,7 +37,11 @@ def test_xmm_image_loading(self):
                             search_distance={'xmm': Quantity(30, 'arcmin')}, load_profiles=False)
 
         # Retrieve and verify
-        imgs = src.get_images(lo_en=Quantity(0.5, 'keV'), hi_en=Quantity(2.0, 'keV'), telescope='xmm')
+        try:
+            imgs = src.get_images(lo_en=Quantity(0.5, 'keV'), hi_en=Quantity(2.0, 'keV'), telescope='xmm')
+        except NoProductAvailableError:
+            self.fail("NoProductAvailableError raised.")
+
         if not isinstance(imgs, list):
             imgs = [imgs]
 
@@ -60,7 +65,11 @@ def test_xmm_expmap_loading(self):
                             search_distance={'xmm': Quantity(30, 'arcmin')}, load_profiles=False)
 
         # Retrieve and verify
-        exps = src.get_expmaps(lo_en=Quantity(0.5, 'keV'), hi_en=Quantity(2.0, 'keV'), telescope='xmm')
+        try:
+            exps = src.get_expmaps(lo_en=Quantity(0.5, 'keV'), hi_en=Quantity(2.0, 'keV'), telescope='xmm')
+        except NoProductAvailableError:
+            self.fail("NoProductAvailableError raised.")
+
         if not isinstance(exps, list):
             exps = [exps]
 
@@ -83,7 +92,11 @@ def test_xmm_spectrum_loading(self):
                             search_distance={'xmm': Quantity(30, 'arcmin')}, load_profiles=False)
 
         # Retrieve and verify
-        specs = src.get_spectra('r500', telescope='xmm')
+        try:
+            specs = src.get_spectra('r500', telescope='xmm')
+        except NoProductAvailableError:
+            self.fail("NoProductAvailableError raised.")
+
         if not isinstance(specs, list):
             specs = [specs]
 
@@ -107,7 +120,11 @@ def test_erass_image_loading(self):
                             search_distance={'erass': Quantity(3.6, 'deg')}, load_profiles=False)
 
         # Retrieve and verify
-        imgs = src.get_images(lo_en=Quantity(0.5, 'keV'), hi_en=Quantity(2.0, 'keV'), telescope='erass')
+        try:
+            imgs = src.get_images(lo_en=Quantity(0.5, 'keV'), hi_en=Quantity(2.0, 'keV'), telescope='erass')
+        except NoProductAvailableError:
+            self.fail("NoProductAvailableError raised.")
+
         if not isinstance(imgs, list):
             imgs = [imgs]
 
@@ -132,7 +149,11 @@ def test_erass_spectrum_loading(self):
                             search_distance={'erass': Quantity(3.6, 'deg')}, load_profiles=False)
 
         # Retrieve and verify
-        specs = src.get_spectra('r500', telescope='erass')
+        try:
+            specs = src.get_spectra('r500', telescope='erass')
+        except NoProductAvailableError:
+            self.fail("NoProductAvailableError raised.")
+
         if not isinstance(specs, list):
             specs = [specs]
 
@@ -156,7 +177,11 @@ def test_chandra_image_loading(self):
                             search_distance={'chandra': Quantity(10, 'arcmin')}, load_profiles=False)
 
         # Retrieve and verify
-        imgs = src.get_images(lo_en=Quantity(0.5, 'keV'), hi_en=Quantity(2.0, 'keV'), telescope='chandra')
+        try:
+            imgs = src.get_images(lo_en=Quantity(0.5, 'keV'), hi_en=Quantity(2.0, 'keV'), telescope='chandra')
+        except NoProductAvailableError:
+            self.fail("NoProductAvailableError raised.")
+
         if not isinstance(imgs, list):
             imgs = [imgs]
 
@@ -180,7 +205,11 @@ def test_chandra_spectrum_loading(self):
                             search_distance={'chandra': Quantity(10, 'arcmin')}, load_profiles=False)
 
         # Retrieve and verify
-        specs = src.get_spectra('r500', telescope='chandra')
+        try:
+            specs = src.get_spectra('r500', telescope='chandra')
+        except NoProductAvailableError:
+            self.fail("NoProductAvailableError raised.")
+
         if not isinstance(specs, list):
             specs = [specs]