TST: remove tests for pseudo async methods, it needs a full rewrite. Also, skip BOX tests as TAP server doesn’t support it

Author: bsipocz

astroquery/ipac/irsa/core.py

@@ -8,18 +8,20 @@
 """
 
 import warnings
-import astropy.units as u
-from astropy.coordinates import SkyCoord, ICRS
+from astropy.coordinates import SkyCoord
+from astropy import units as u
 from astropy.utils.decorators import deprecated_renamed_argument
 from pyvo.dal.tap import TAPService
 from astroquery import log
 from astroquery.query import BaseQuery
 from astroquery.utils.commons import parse_coordinates
 from astroquery.ipac.irsa import conf
-from astroquery.exceptions import TableParseError, NoResultsWarning, InvalidQueryError
+from astroquery.exceptions import InvalidQueryError
 
 
 __all__ = ['Irsa', 'IrsaClass']
+
+
 class IrsaClass(BaseQuery):
 
     def __init__(self):

astroquery/ipac/irsa/tests/test_irsa.py

@@ -41,54 +41,10 @@ def get_mockreturn(method, url, params=None, timeout=10, cache=False, **kwargs):
     return MockResponse(content, **kwargs)
 
 
-@pytest.mark.parametrize(('dim'),
-                         ['5d0m0s', 0.3 * u.rad, '5h0m0s', 2 * u.arcmin])
-def test_parse_dimension(dim):
-    # check that the returned dimension is always in units of 'arcsec',
-    # 'arcmin' or 'deg'
-    new_dim = irsa.core._parse_dimension(dim)
-    assert new_dim.unit in ['arcsec', 'arcmin', 'deg']
-
-
-@pytest.mark.parametrize(('ra', 'dec', 'expected'),
-                         [(10, 10, '10 +10'),
-                          (10.0, -11, '10.0 -11')
-                          ])
-def test_format_decimal_coords(ra, dec, expected):
-    out = irsa.core._format_decimal_coords(ra, dec)
-    assert out == expected
-
-
-@pytest.mark.parametrize(('coordinates', 'expected'),
-                         [("5h0m0s 0d0m0s", "75.0 +0.0")
-                          ])
-def test_parse_coordinates(coordinates, expected):
-    out = irsa.core._parse_coordinates(coordinates)
-    for a, b in zip(out.split(), expected.split()):
-        try:
-            a = float(a)
-            b = float(b)
-            np.testing.assert_almost_equal(a, b)
-        except ValueError:
-            assert a == b
-
-
-def test_args_to_payload():
-    out = Irsa._args_to_payload("fp_psc")
-    assert out == dict(catalog='fp_psc', outfmt=3, outrows=conf.row_limit,
-                       selcols='')
-
-
-@pytest.mark.parametrize(("coordinates"), OBJ_LIST)
-def test_query_region_cone_async(coordinates, patch_get):
-    response = Irsa.query_region_async(
-        coordinates, catalog='fp_psc', spatial='Cone',
-        radius=2 * u.arcmin, get_query_payload=True)
-    assert response['radius'] == 2
-    assert response['radunits'] == 'arcmin'
-    response = Irsa.query_region_async(
-        coordinates, catalog='fp_psc', spatial='Cone', radius=2 * u.arcmin)
-    assert response is not None
+#def test_args_to_payload():
+#    out = Irsa._args_to_payload("fp_psc")
+#    assert out == dict(catalog='fp_psc', outfmt=3, outrows=conf.row_limit,
+#                       selcols='')
 
 
 @pytest.mark.parametrize(("coordinates"), OBJ_LIST)
@@ -99,18 +55,8 @@ def test_query_region_cone(coordinates, patch_get):
     assert isinstance(result, Table)
 
 
-@pytest.mark.parametrize(("coordinates"), OBJ_LIST)
-def test_query_region_box_async(coordinates, patch_get):
-    response = Irsa.query_region_async(
-        coordinates, catalog='fp_psc', spatial='Box',
-        width=2 * u.arcmin, get_query_payload=True)
-    assert response['size'] == 120
-    response = Irsa.query_region_async(
-        coordinates, catalog='fp_psc', spatial='Box', width=2 * u.arcmin)
-    assert response is not None
-
-
-@pytest.mark.parametrize(("coordinates"), OBJ_LIST)
+@pytest.mark.skip("Upstream TAP doesn't support Box geometry yet")
+@pytest.mark.parametrize("coordinates", OBJ_LIST)
 def test_query_region_box(coordinates, patch_get):
     result = Irsa.query_region(
         coordinates, catalog='fp_psc', spatial='Box', width=2 * u.arcmin)
@@ -125,51 +71,17 @@ def test_query_region_box(coordinates, patch_get):
          (10.0 * u.deg, 10.0 * u.deg)]
 
 
-@pytest.mark.parametrize(("polygon"), [poly1, poly2])
-def test_query_region_async_polygon(polygon, patch_get):
-    response = Irsa.query_region_async(
-        "m31", catalog="fp_psc", spatial="Polygon",
-        polygon=polygon, get_query_payload=True)
-
-    for a, b in zip(re.split("[ ,]", response["polygon"]),
-                    re.split("[ ,]", "10.1 +10.1,10.0 +10.1,10.0 +10.0")):
-        for a1, b1 in zip(a.split(), b.split()):
-            a1 = float(a1)
-            b1 = float(b1)
-            np.testing.assert_almost_equal(a1, b1)
-
-    response = Irsa.query_region_async(
-        "m31", catalog="fp_psc", spatial="Polygon", polygon=polygon)
-
-    assert response is not None
-
-
-@pytest.mark.parametrize(("polygon"),
-                         [poly1,
-                          poly2,
-                          ])
+@pytest.mark.parametrize("polygon", [poly1, poly2])
 def test_query_region_polygon(polygon, patch_get):
-    result = Irsa.query_region(
-        "m31", catalog="fp_psc", spatial="Polygon", polygon=polygon)
+    result = Irsa.query_region("m31", catalog="fp_psc", spatial="Polygon", polygon=polygon)
 
     assert isinstance(result, Table)
 
 
-@pytest.mark.parametrize(('spatial', 'result'),
-                         zip(('Cone', 'Box', 'Polygon', 'All-Sky'),
-                             ('Cone', 'Box', 'Polygon', 'NONE')))
-def test_spatial_valdi(spatial, result):
-    out = Irsa._parse_spatial(
-        spatial, coordinates='m31', radius=5 * u.deg, width=5 * u.deg,
-        polygon=[(5 * u.hour, 5 * u.deg)] * 3)
-    assert out['spatial'] == result
-
-
-@pytest.mark.parametrize(('spatial'), [('cone', 'box', 'polygon', 'all-Sky',
-                                        'All-sky', 'invalid', 'blah')])
+@pytest.mark.parametrize('spatial', ['cone', 'box', 'polygon', 'all-Sky', 'All-sky', 'invalid'])
 def test_spatial_invalid(spatial):
     with pytest.raises(ValueError):
-        Irsa._parse_spatial(spatial, coordinates='m31')
+        Irsa.query_region("m31", catalog='invalid_spatial', spatial=spatial)
 
 
 def test_deprecated_namespace_import_warning():

astroquery/ipac/irsa/tests/test_irsa_remote.py

@@ -16,37 +16,18 @@
 
 @pytest.mark.remote_data
 class TestIrsa:
-    def test_query_region_cone_async(self):
-        response = Irsa.query_region_async(
-            'm31', catalog='fp_psc', spatial='Cone', radius=2 * u.arcmin, cache=False)
-        assert response is not None
-
     def test_query_region_cone(self):
         result = Irsa.query_region(
             'm31', catalog='fp_psc', spatial='Cone', radius=2 * u.arcmin, cache=False)
         assert isinstance(result, Table)
 
-    def test_query_region_box_async(self):
-        response = Irsa.query_region_async(
-            "00h42m44.330s +41d16m07.50s", catalog='fp_psc', spatial='Box',
-            width=2 * u.arcmin, cache=False)
-        assert response is not None
-
+    @pytest.mark.skip("Upstream TAP doesn't support Box geometry yet")
     def test_query_region_box(self):
         result = Irsa.query_region(
             "00h42m44.330s +41d16m07.50s", catalog='fp_psc', spatial='Box',
             width=2 * u.arcmin, cache=False)
         assert isinstance(result, Table)
 
-    def test_query_region_async_polygon(self):
-        polygon = [SkyCoord(ra=10.1, dec=10.1, unit=(u.deg, u.deg)),
-                   SkyCoord(ra=10.0, dec=10.1, unit=(u.deg, u.deg)),
-                   SkyCoord(ra=10.0, dec=10.0, unit=(u.deg, u.deg))]
-        response = Irsa.query_region_async(
-            "m31", catalog="fp_psc", spatial="Polygon", polygon=polygon, cache=False)
-
-        assert response is not None
-
     def test_query_region_polygon(self):
         polygon = [(10.1, 10.1), (10.0, 10.1), (10.0, 10.0)]
         with pytest.warns(UserWarning, match='Polygon endpoints are being interpreted'):
@@ -56,7 +37,7 @@ def test_query_region_polygon(self):
         assert isinstance(result, Table)
 
     def test_list_catalogs(self):
-        catalogs = Irsa.list_catalogs(cache=False)
+        catalogs = Irsa.list_catalogs()
         # Number of available catalogs may change over time, test only for significant drop.
-        # (at the time of writing there are 587 catalogs in the list).
-        assert len(catalogs) > 500
+        # (at the time of writing there are 933 tables in the list).
+        assert len(catalogs) > 900