Don't change expected Exceptions in tests

Author: jdavies-st

astroquery/hips2fits/tests/test_hips2fits_remote.py

@@ -4,7 +4,6 @@
 import pytest
 from astropy import wcs as astropy_wcs
 from astropy.io import fits
-from astropy.utils.exceptions import AstropyUserWarning
 import numpy as np
 from matplotlib.colors import Colormap
 
@@ -83,7 +82,7 @@ def test_query_jpg_no_wcs(self):
         assert isinstance(result, np.ndarray) and result.shape[2] == 3
 
     def test_bad_strech(self):
-        with pytest.raises(AttributeError, match=r"Unknown value azs for stretch parameter"):
+        with pytest.raises(AttributeError):
             hips2fits.query_with_wcs(
                 hips=self.hips,
                 wcs=self.w,

astroquery/vizier/tests/test_vizier_remote.py

@@ -6,7 +6,6 @@
 
 from astroquery import vizier
 from astroquery.utils import commons
-from astroquery.exceptions import TableParseError
 
 
 @pytest.mark.remote_data
@@ -124,9 +123,8 @@ def test_multicoord(self):
 
     def test_findcatalog_maxcatalog(self):
         V = vizier.core.Vizier()
-        with pytest.raises(TableParseError, match=r"Failed to parse VIZIER result"):
-            cats = V.find_catalogs('eclipsing binary', max_catalogs=5000)
-            assert len(cats) >= 468
+        cats = V.find_catalogs('eclipsing binary', max_catalogs=5000)
+        assert len(cats) >= 468
 
         # with pytest.raises(ValueError) as exc:
         #    V.find_catalogs('eclipsing binary')
@@ -137,10 +135,9 @@ def test_findcatalog_maxcatalog(self):
     def test_findcatalog_ucd(self):
         V = vizier.core.Vizier()
         ucdresult = V(ucd='time.age*').find_catalogs('eclipsing binary', max_catalogs=5000)
-        with pytest.raises(TableParseError, match=r"Failed to parse VIZIER result"):
-            result = V.find_catalogs('eclipsing binary', max_catalogs=5000)
+        result = V.find_catalogs('eclipsing binary', max_catalogs=5000)
 
-            assert len(ucdresult) >= 12  # count as of 1/15/2018
-            assert len(result) >= 628
-            # important part: we're testing that UCD is parsed and some catalogs are ruled out
-            assert len(ucdresult) < len(result)
+        assert len(ucdresult) >= 12  # count as of 1/15/2018
+        assert len(result) >= 628
+        # important part: we're testing that UCD is parsed and some catalogs are ruled out
+        assert len(ucdresult) < len(result)