More warning message edits

Author: snbianco

astroquery/mast/cloud.py

@@ -148,7 +148,7 @@ def get_cloud_uri(self, data_product, include_bucket=True, full_url=False):
 
         # Making sure we got at least 1 URI from the query above.
         if not uri_list or uri_list[0] is None:
-            warnings.warn('Unable to locate file {}.'.format(data_product[0]), NoResultsWarning)
+            return
         else:
             # Output from ``get_cloud_uri_list`` is always a list even when it's only 1 URI
             return uri_list[0]
@@ -200,7 +200,7 @@ def get_cloud_uri_list(self, data_products, *, include_bucket=True, full_url=Fal
                     if e.response['Error']['Code'] != "404":
                         raise
                     if verbose:
-                        warnings.warn("Unable to locate file {}.".format(path), NoResultsWarning)
+                        warnings.warn(f"Failed to retrieve cloud path for {path}", NoResultsWarning)
                     uri_list.append(None)
 
         return uri_list

astroquery/mast/tests/test_mast.py

@@ -1166,7 +1166,7 @@ def test_observations_get_cloud_uris_error(mock_client, patch_post):
     exc = ClientError({'Error': {'Code': '404', 'Message': 'Not Found'}}, 'HeadObject')
     mock_client.return_value.head_object.side_effect = exc
 
-    with pytest.warns(NoResultsWarning, match='Unable to locate file'):
+    with pytest.warns(NoResultsWarning, match='Failed to retrieve cloud path'):
         uris = mast.Observations.get_cloud_uris(['mast:HST/product/u9o40504m_c3m.fits'])
     assert uris == []