Fix Path import in core; parametrize test_esasky_get_spectra_obs_id

Author: jdavies-st

astroquery/esasky/core.py

@@ -7,6 +7,7 @@
 import re
 from io import BytesIO
 from zipfile import ZipFile
+from pathlib import Path
 
 from astropy.io import fits
 from astroquery import log

astroquery/esasky/tests/test_esasky_remote.py

@@ -86,20 +86,21 @@ def test_esasky_get_images_obs_id(self, tmp_path, mission, obsid):
         else:
             assert isinstance(result[mission.upper()][0], HDUList)
 
-    def test_esasky_get_spectra_obs_id(self, tmp_path):
-        missions = ["ISO-IR", "Chandra", "IUE", "XMM-NEWTON", "HST-IR", "Herschel", "HST-UV", "HST-OPTICAL"]
+    @pytest.mark.parametrize("mission, observation_id",
+                             zip(["ISO-IR", "Chandra", "IUE", "XMM-NEWTON",
+                                  "HST-IR", "Herschel", "HST-UV", "HST-OPTICAL"],
+                                 ["02101201", "1005", "LWR13178", "0001730201",
+                                  "ibh706cqq", "1342253595", "z1ax0102t", "oeik2s020"]))
+    def test_esasky_get_spectra_obs_id(self, tmp_path, mission, observation_id):
+        result = ESASky.get_spectra(observation_ids=observation_id,
+                                    missions=mission, download_dir=tmp_path)
 
-        result = ESASky.get_spectra(observation_ids=["02101201", "1005", "LWR13178", "0001730201", "ibh706cqq",
-                                                     "1342253595", "z1ax0102t", "oeik2s020"],
-                                    missions=missions, download_dir=tmp_path)
-
-        for mission in missions:
-            assert (tmp_path / mission).exists()
-            if mission.upper() == "HERSCHEL":
-                assert (isinstance(result[mission.upper()]["1342253595"]["WBS"]["WBS-V_USB_4b"], HDUList))
-                assert (isinstance(result[mission.upper()]["1342253595"]["HRS"]["HRS-H_LSB_4b"], HDUList))
-            else:
-                assert (isinstance(result[mission.upper()][0], HDUList))
+        assert Path(tmp_path, mission).exists()
+        if mission == "Herschel":
+            assert isinstance(result[mission.upper()]["1342253595"]["WBS"]["WBS-V_USB_4b"], HDUList)
+            assert isinstance(result[mission.upper()]["1342253595"]["HRS"]["HRS-H_LSB_4b"], HDUList)
+        else:
+            assert isinstance(result[mission.upper()][0], HDUList)
 
     def test_esasky_query_region_maps(self):
         result = ESASky.query_region_maps(position="M51", radius="5 arcmin")
@@ -111,7 +112,7 @@ def test_esasky_query_object_maps(self):
 
     @pytest.mark.bigdata
     @pytest.mark.parametrize("mission", ['XMM', 'Chandra', 'XMM-OM-OPTICAL',
-                                         'ISO-IR','Herschel', 'JWST_Mid-IR',
+                                         'ISO-IR', 'Herschel', 'JWST_Mid-IR',
                                          'JWST_Near-IR', 'Spitzer'])
     def test_esasky_get_images(self, tmp_path, mission):
         ESASky.get_images(position="M51", missions=mission, download_dir=tmp_path)