Merge pull request #3383 from bsipocz/MAINT_overflow_message_change

MAINT: adding workaround for pyvo Warning message changes

Author: bsipocz

astroquery/alma/tests/test_alma_remote.py

@@ -37,6 +37,9 @@
 
 download_hostname = 'almascience.eso.org'
 
+# The MAXREC related overflow message is different in pyvo 1.7+, remove workaround when we have it as a minimum
+overflow_message = r"Partial result set. Potential causes MAXREC|Result set limited by user- or server-supplied MAXREC"
+
 
 @pytest.fixture
 def alma(request):
@@ -56,14 +59,12 @@ def alma(request):
 @pytest.mark.remote_data
 class TestAlma:
     def test_public(self, alma):
-        with pytest.warns(expected_warning=DALOverflowWarning,
-                          match="Partial result set. Potential causes MAXREC, async storage space, etc."):
+        with pytest.warns(expected_warning=DALOverflowWarning, match=overflow_message):
             results = alma.query(payload=None, public=True, maxrec=100)
         assert len(results) == 100
         for row in results:
             assert row['data_rights'] == 'Public'
-        with pytest.warns(expected_warning=DALOverflowWarning,
-                          match="Partial result set. Potential causes MAXREC, async storage space, etc."):
+        with pytest.warns(expected_warning=DALOverflowWarning, match=overflow_message):
             results = alma.query(payload=None, public=False, maxrec=100)
         assert len(results) == 100
         for row in results:
@@ -105,8 +106,7 @@ def test_freq(self, alma):
     def test_bands(self, alma):
         payload = {'band_list': ['5', '7']}
         # Added maxrec here as downloading and reading the results take too long.
-        with pytest.warns(expected_warning=DALOverflowWarning,
-                          match="Partial result set. Potential causes MAXREC, async storage space, etc."):
+        with pytest.warns(expected_warning=DALOverflowWarning, match=overflow_message):
             result = alma.query(payload, maxrec=1000)
         assert len(result) > 0
         for row in result:
@@ -342,8 +342,7 @@ def test_misc(self, alma):
 
         result = alma.query_object('M83', public=True, science=True)
         assert len(result) > 0
-        with pytest.warns(expected_warning=DALOverflowWarning,
-                          match="Partial result set. Potential causes MAXREC, async storage space, etc."):
+        with pytest.warns(expected_warning=DALOverflowWarning, match=overflow_message):
             result = alma.query(payload={'pi_name': 'Bally*'}, public=True,
                                 maxrec=10)
         assert result

astroquery/heasarc/tests/test_heasarc_remote.py

@@ -11,6 +11,7 @@
 from astropy.utils.exceptions import AstropyDeprecationWarning
 from astroquery.exceptions import NoResultsWarning
 import pyvo
+from pyvo.dal.exceptions import DALOverflowWarning
 
 from astroquery.heasarc import Heasarc
 
@@ -56,6 +57,9 @@
     ],
 ]
 
+# The MAXREC related overflow message is different in pyvo 1.7+, remove workaround when we have it as a minimum
+overflow_message = r"Partial result set. Potential causes MAXREC|Result set limited by user- or server-supplied MAXREC"
+
 
 @pytest.mark.remote_data
 class TestHeasarc:
@@ -158,13 +162,8 @@ def test_list_catalogs__keywords(self):
         reason="DALOverflowWarning is available only in pyvo>=1.4"
     )
     def test_tap__maxrec(self):
-        from pyvo.dal.exceptions import DALOverflowWarning
         query = "SELECT TOP 10 ra,dec FROM xray"
-        with pytest.warns(
-            expected_warning=DALOverflowWarning,
-            match=("Partial result set. Potential causes MAXREC, "
-                   "async storage space, etc."),
-        ):
+        with pytest.warns(expected_warning=DALOverflowWarning, match=overflow_message):
             result = Heasarc.query_tap(query=query, maxrec=5)
         assert len(result) == 5
         assert result.to_table().colnames == ["ra", "dec"]

astroquery/ipac/irsa/tests/test_irsa_remote.py

@@ -6,8 +6,6 @@
 from astropy.coordinates import SkyCoord
 from astropy.utils.exceptions import AstropyDeprecationWarning
 
-from pyvo.dal.exceptions import DALOverflowWarning
-
 from astroquery.ipac.irsa import Irsa
 
 
@@ -114,9 +112,8 @@ def test_list_collections_filter(self):
 
     def test_tap(self):
         query = "SELECT TOP 5 ra,dec FROM cosmos2015"
-        with pytest.warns(expected_warning=DALOverflowWarning,
-                          match="Partial result set. Potential causes MAXREC, async storage space, etc."):
-            result = Irsa.query_tap(query=query)
+
+        result = Irsa.query_tap(query=query)
         assert len(result) == 5
         assert result.to_table().colnames == ['ra', 'dec']
 

astroquery/simbad/tests/test_simbad_remote.py

@@ -21,6 +21,9 @@
 ICRS_COORDS_SgrB2 = SkyCoord(266.835*u.deg, -28.38528*u.deg, frame='icrs')
 multicoords = SkyCoord([ICRS_COORDS_SgrB2, ICRS_COORDS_SgrB2])
 
+# The MAXREC related overflow message is different in pyvo 1.7+, remove workaround when we have it as a minimum
+overflow_message = r"Partial result set. Potential causes MAXREC|Result set limited by user- or server-supplied MAXREC"
+
 
 @pytest.mark.remote_data()
 class TestSimbad:
@@ -156,7 +159,7 @@ def test_query_tap(self):
                   "      c       3")
         assert expect == str(result)
         # Test query_tap raised errors
-        with pytest.warns(DALOverflowWarning, match="Partial result set *"):
+        with pytest.warns(DALOverflowWarning, match=overflow_message):
             truncated_result = Simbad.query_tap("SELECT * from basic", maxrec=2)
             assert len(truncated_result) == 2
         with pytest.raises(ValueError, match="The maximum number of records cannot exceed 2000000."):