Improved calibration_data test coverage.

specreduce/calibration_data.py

@@ -353,13 +353,13 @@ def __init__(
                     extinction,
                     u.MagUnit(u.dimensionless_unscaled)
                 ).to(u.dimensionless_unscaled)  # Spectrum1D wants this to be linear
-            if isinstance(extinction, (u.LogUnit, u.Magnitude)) or extinction.unit == u.mag:
+            elif isinstance(extinction, (u.LogUnit, u.Magnitude)) or extinction.unit == u.mag:
                 # if in log or magnitudes, recast into Magnitude with dimensionless physical units
                 extinction = u.Magnitude(
                     extinction.value,
                     u.MagUnit(u.dimensionless_unscaled)
                 ).to(u.dimensionless_unscaled)
-            if extinction.unit != u.dimensionless_unscaled:
+            elif extinction.unit != u.dimensionless_unscaled:
                 # if we're given something linear that's not dimensionless_unscaled,
                 # it's an error
                 msg = "Input extinction must have unscaled dimensionless units."

specreduce/tests/test_linelists.py

@@ -43,6 +43,15 @@ def test_pypeit_comma_list():
     assert "NeI" in line_tab['ion']
 
 
+@pytest.mark.remote_data
+def test_pypeit_nonexisting_lamp():
+    """
+    Test to make sure a warning is raised if the lamp list includes a bad lamp name.
+    """
+    with pytest.warns(UserWarning, match='NeJ not in the list'):
+        line_tab = load_pypeit_calibration_lines(["HeI", "NeJ"], cache=True, show_progress=False)
+
+
 @pytest.mark.remote_data
 def test_pypeit_empty():
     """

specreduce/tests/test_specphot_stds.py

@@ -1,3 +1,5 @@
+from urllib.error import URLError
+
 import pytest
 from astropy.utils.exceptions import AstropyUserWarning
 
@@ -11,6 +13,12 @@ def test_load_MAST():
     assert len(sp.spectral_axis) > 0
 
 
+@pytest.mark.remote_data
+def test_load_MAST_bad_filename():
+    with pytest.warns(AstropyUserWarning, match="Downloading of"):
+        sp = load_MAST_calspec("j191b2b_005.fits", show_progress=False)
+
+
 @pytest.mark.remote_data
 def test_load_onedstds():
     sp = load_onedstds()
@@ -23,3 +31,10 @@ def test_load_onedstds_bad_dataset():
     with pytest.warns(AstropyUserWarning, match="Specfied dataset,"):
         sp = load_onedstds("snffactory")
     assert sp is None
+
+
+@pytest.mark.remote_data
+def test_load_onedstds_bad_specfile():
+    with pytest.warns(AstropyUserWarning, match="Can't load"):
+        sp = load_onedstds(specfile="FG131.dat")
+    assert sp is None