Get TAP supported tables from TAP query and add table test.

Author: rickynilsson

astroquery/nasa_exoplanet_archive/core.py

@@ -97,16 +97,15 @@ def get_access_url(service='tap'):
     return url
 
 
-# @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
+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 = ['ps', 'pscomppars']  # get_tap_tables(conf.url_tap)
+TAP_TABLES = get_tap_tables(conf.url_tap)  # TAP_TABLES = ['ps', 'pscomppars']
 
 
 class InvalidTableError(InvalidQueryError):

astroquery/nasa_exoplanet_archive/tests/test_nasa_exoplanet_archive.py

@@ -295,3 +295,20 @@ def mock_run_query(table="ps", select=["hostname", "pl_name"], where="hostname='
     nasa_exoplanet_archive.query_criteria = mock_run_query
     payload = nasa_exoplanet_archive.query_criteria()
     assert payload["select"] == "hostname,pl_name"
+
+
+@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')
+def test_get_tap_tables():
+    nasa_exoplanet_archive = NasaExoplanetArchive()
+
+    def mock_run_query(url=conf.url_tap):
+        assert url == conf.url_tap
+        result = PropertyMock()
+        result = ['transitspec', 'emissionspec', 'ps', 'pscomppars', 'keplernames', 'k2names']
+        return result
+    nasa_exoplanet_archive.get_tap_tables = mock_run_query
+    result = nasa_exoplanet_archive.get_tap_tables()
+    assert 'ps' in result
+    assert 'pscomppars' in result