test fixes

Author: snbianco

astroquery/mast/cloud.py

@@ -112,7 +112,7 @@ def get_cloud_uri(self, data_product, include_bucket=True, full_url=False):
         uri_list = self.get_cloud_uri_list(data_product, include_bucket=include_bucket, full_url=full_url)
 
         # Making sure we got at least 1 URI from the query above.
-        if uri_list[0] is None:
+        if not uri_list or uri_list[0] is None:
             warnings.warn("Unable to locate file {}.".format(data_product), NoResultsWarning)
         else:
             # Output from ``get_cloud_uri_list`` is always a list even when it's only 1 URI

astroquery/mast/tests/test_mast_remote.py

@@ -526,12 +526,13 @@ def test_get_cloud_uri(self, test_data_uri, expected_cloud_uri):
         assert len(uri) > 0, f'Product for dataURI {test_data_uri} was not found in the cloud.'
         assert uri == expected_cloud_uri, f'Cloud URI does not match expected. ({uri} != {expected_cloud_uri})'
 
-    def test_get_cloud_uris(self):
+    @pytest.mark.parametrize("test_obs_id", ["25568122", "31411"])
+    def test_get_cloud_uris(self, test_obs_id):
         pytest.importorskip("boto3")
-        test_obs_id = '25568122'
 
         # get a product list
-        products = Observations.get_product_list(test_obs_id)[24:]
+        index = 24 if test_obs_id == '25568122' else 0
+        products = Observations.get_product_list(test_obs_id)[index:]
 
         assert len(products) > 0, (f'No products found for OBSID {test_obs_id}. '
                                    'Unable to move forward with getting URIs from the cloud.')
@@ -556,17 +557,13 @@ def test_get_cloud_uris_query(self):
         Observations.enable_cloud_dataset()
 
         # get uris with other functions
-        obs = Observations.query_criteria(target_name=234295610,
-                                          provenance_name="SPOC",
-                                          sequence_number=[1, 2])
+        obs = Observations.query_criteria(target_name=234295610)
         prod = Observations.get_product_list(obs)
         filt = Observations.filter_products(prod, calib_level=[2])
         s3_uris = Observations.get_cloud_uris(filt)
 
         # get uris with streamlined function
         uris = Observations.get_cloud_uris(target_name=234295610,
-                                           provenance_name="SPOC",
-                                           sequence_number=[1, 2],
                                            filter_products={'calib_level': [2]})
         assert s3_uris == uris
 

docs/mast/mast_catalog.rst

@@ -24,7 +24,7 @@ The returned fields vary by catalog, find the field documentation for specific c
 `here <https://mast.stsci.edu/api/v0/pages.html>`__.
 If no catalog is specified, the Hubble Source Catalog will be queried.
 
-.. doctest-remote-data::
+.. doctest-skip::
 
    >>> from astroquery.mast import Catalogs
    ...
@@ -261,19 +261,17 @@ Given an HSC Match ID, return all catalog results.
    >>> catalog_data = Catalogs.query_object("M10", radius=.02, catalog="HSC")
    >>> matchid = catalog_data[0]["MatchID"]
    >>> print(matchid)
-   63980492
+   7542452
    >>> matches = Catalogs.query_hsc_matchid(matchid)
    >>> print(matches)
-     CatID   MatchID  ...                       cd_matrix
-   --------- -------- ... ------------------------------------------------------
-   257195287 63980492 ... -1.38889e-005 -5.26157e-010 -5.26157e-010 1.38889e-005
-   257440119 63980492 ... -1.38889e-005 -5.26157e-010 -5.26157e-010 1.38889e-005
-   428373428 63980492 ...   -1.10056e-005 5.65193e-010 5.65193e-010 1.10056e-005
-   428373427 63980492 ...   -1.10056e-005 5.65193e-010 5.65193e-010 1.10056e-005
-   428373429 63980492 ...   -1.10056e-005 5.65193e-010 5.65193e-010 1.10056e-005
-   410574499 63980492 ...   -1.10056e-005 1.56577e-009 1.56577e-009 1.10056e-005
-   410574498 63980492 ...   -1.10056e-005 1.56577e-009 1.56577e-009 1.10056e-005
-   410574497 63980492 ...   -1.10056e-005 1.56577e-009 1.56577e-009 1.10056e-005
+     CatID   MatchID ...                       cd_matrix                       
+   --------- ------- ... ------------------------------------------------------
+   419094794 7542452 ...   -1.10056e-005 5.65193e-010 5.65193e-010 1.10056e-005
+   419094795 7542452 ...   -1.10056e-005 5.65193e-010 5.65193e-010 1.10056e-005
+   401289578 7542452 ...   -1.10056e-005 1.56577e-009 1.56577e-009 1.10056e-005
+   401289577 7542452 ...   -1.10056e-005 1.56577e-009 1.56577e-009 1.10056e-005
+   257194049 7542452 ... -1.38889e-005 -5.26157e-010 -5.26157e-010 1.38889e-005
+   257438887 7542452 ... -1.38889e-005 -5.26157e-010 -5.26157e-010 1.38889e-005
 
 
 HSC spectra accessed through this class as well. `~astroquery.mast.CatalogsClass.get_hsc_spectra`

docs/mast/mast_obsquery.rst

@@ -284,7 +284,7 @@ with `~astroquery.mast.ObservationsClass.get_product_list`
 (see `here <https://mast.stsci.edu/api/v0/_c_a_o_mfields.html>`__ for more details).
 Using "obs_id" instead of "obsid" from the previous example will result in the following error:
 
-.. doctest-remote-data::
+.. doctest-skip::
    >>> obs_ids = obs_table[0:2]['obs_id']
    >>> data_products_by_id = Observations.get_product_list(obs_ids)
    Traceback (most recent call last):
@@ -325,12 +325,12 @@ Product filtering can also be applied directly to a table of products without pr
    ...
    >>> data_products = Observations.get_product_list('25588063')
    >>> print(len(data_products))
-   27
+   30
    >>> products = Observations.filter_products(data_products,
    ...                                         productType=["SCIENCE", "PREVIEW"],
    ...                                         extension="fits")
    >>> print(len(products))
-   8
+   10
 
 
 Downloading Data Products