Clean up mock tests and try fetching TAP tables again

Author: rickynilsson

astroquery/nasa_exoplanet_archive/core.py

@@ -5,6 +5,7 @@
 import io
 import re
 import warnings
+import pytest
 
 # Import various astropy modules
 import astropy.coordinates as coord
@@ -96,12 +97,18 @@ def get_access_url(service='tap'):
         url = conf.url_api
     return url
 
-# def get_tap_tables(url):
-#     """Tables accessed by API are gradually migrating to TAP service. Generate current list of tables in TAP."""
-#     tap = pyvo.dal.tap.TAPService(baseurl=url)
-#     response = tap.search(query="select * from TAP_SCHEMA.tables", language="ADQL")
-#     tables = [table for table in response["table_name"].data if "TAP_SCHEMA." not in table]
-#     return tables
+
+@pytest.mark.remote_data
+def get_tap_tables(url):
+    """Tables accessed by API are gradually migrating to TAP service. Generate current list of tables in TAP."""
+    tap = pyvo.dal.tap.TAPService(baseurl=url)
+    response = tap.search(query="select * from TAP_SCHEMA.tables", language="ADQL")
+    tables = [table for table in response["table_name"].data if "TAP_SCHEMA." not in table]
+    return tables
+
+
+TAP_TABLES = get_tap_tables(conf.url_tap)
+
 
 class InvalidTableError(InvalidQueryError):
     """Exception thrown if the given table is not recognized by the Exoplanet Archive Servers"""
@@ -195,7 +202,7 @@ def query_criteria_async(self, table, get_query_payload=False, cache=None, **cri
         if cache is None:
             cache = self.CACHE
 
-        if table in ['ps', 'pscomppars']:
+        if table in TAP_TABLES:
             tap = pyvo.dal.tap.TAPService(baseurl=self.URL_TAP)
             # construct query from table and request_payload (including format)
             tap_query = self._request_to_sql(request_payload)
@@ -335,7 +342,7 @@ def query_object_async(self, object_name, *, table="ps", get_query_payload=False
                 "Any filters using the 'where' argument are ignored in ``query_object``. Consider using ``query_criteria`` instead.",
                 InputWarning,
             )
-        if table in ['ps', 'pscomppars']:
+        if table in TAP_TABLES:
             criteria["where"] = "hostname='{1}' OR {0}name='{1}'".format(prefix, object_name.strip())
         else:
             criteria["where"] = "{0}hostname='{1}' OR {0}name='{1}'".format(prefix, object_name.strip())

astroquery/nasa_exoplanet_archive/tests/test_nasa_exoplanet_archive.py

@@ -84,7 +84,6 @@
 ]
 
 
-@pytest.mark.remote_data
 def mock_get(self, method, url, *args, **kwargs):  # pragma: nocover
     assert url == conf.url_api
 
@@ -126,7 +125,6 @@ def mock_get(self, method, url, *args, **kwargs):  # pragma: nocover
     return MockResponse(data.encode("utf-8"))
 
 
-@pytest.mark.remote_data
 @pytest.fixture
 def patch_get(request):  # pragma: nocover
     try:
@@ -140,7 +138,6 @@ def patch_get(request):  # pragma: nocover
     return mp
 
 
-@pytest.mark.remote_data
 def test_regularize_object_name(patch_get):
     assert NasaExoplanetArchive._regularize_object_name("kepler 2") == "HAT-P-7"
     assert NasaExoplanetArchive._regularize_object_name("kepler 1 b") == "TrES-2 b"
@@ -150,7 +147,6 @@ def test_regularize_object_name(patch_get):
     assert "No aliases found for name: 'not a planet'" == str(warning[0].message)
 
 
-@pytest.mark.remote_data
 def test_backwards_compat(patch_get):
     """
     These are the tests from the previous version of this interface.
@@ -188,7 +184,6 @@ def test_backwards_compat(patch_get):
         assert "replaced" in str(error)
 
 
-@pytest.mark.remote_data
 @pytest.mark.filterwarnings("error")
 @pytest.mark.parametrize("table,query", API_TABLES)
 def test_api_tables(patch_get, table, query):
@@ -201,7 +196,6 @@ def test_api_tables(patch_get, table, query):
 
 
 # Mock tests on TAP service below
-@pytest.mark.remote_data
 @patch('astroquery.nasa_exoplanet_archive.core.get_access_url',
        Mock(side_effect=lambda x: 'https://some.url'))
 @pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
@@ -227,7 +221,6 @@ def mock_run_query(object_name="K2-18 b", table="pscomppars", select="pl_name,di
     assert response['dec'] == [7.5878315] * u.deg
 
 
-@pytest.mark.remote_data
 @patch('astroquery.nasa_exoplanet_archive.core.get_access_url',
        Mock(side_effect=lambda x: 'https://some.url'))
 @pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
@@ -247,7 +240,6 @@ def mock_run_query(table="ps", select='pl_name,ra,dec', coordinates=SkyCoord(ra=
     assert 'K2-18 b' in response['pl_name']
 
 
-@pytest.mark.remote_data
 @patch('astroquery.nasa_exoplanet_archive.core.get_access_url',
        Mock(side_effect=lambda x: 'https://some.url'))
 @pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')