Merge pull request #2633 from bsipocz/MAINT_fix_remotes_202212

MAINT: fixing some remote failures from 202212

Author: bsipocz

astroquery/cds/tests/test_mocserver_remote.py

@@ -1,34 +1,35 @@
 # -*- coding: utf-8 -*
 
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
-import sys
 import pytest
 
 from astropy import coordinates
 from astropy.table import Table
 
 try:
     from mocpy import MOC
+    HAS_MOCPY = True
 except ImportError:
-    pass
+    HAS_MOCPY = False
 
 try:
     from regions import CircleSkyRegion
+    HAS_REGIONS = True
 except ImportError:
-    pass
+    HAS_REGIONS = False
 
 from ..core import cds
 
 
 @pytest.mark.remote_data
+@pytest.mark.skipif(not HAS_MOCPY, reason='mocpy is required')
 class TestMOCServerRemote:
     """
     Tests requiring regions
     """
 
     # test of MAXREC payload
-    @pytest.mark.skipif('regions' not in sys.modules,
-                        reason="requires astropy-regions")
+    @pytest.mark.skipif(not HAS_REGIONS, reason='regions is required')
     @pytest.mark.parametrize('max_rec', [3, 10, 25, 100])
     def test_max_rec_param(self, max_rec):
         center = coordinates.SkyCoord(ra=10.8, dec=32.2, unit="deg")
@@ -42,8 +43,7 @@ def test_max_rec_param(self, max_rec):
         assert max_rec == len(result)
 
     # test of field_l when retrieving dataset records
-    @pytest.mark.skipif('regions' not in sys.modules,
-                        reason="requires astropy-regions")
+    @pytest.mark.skipif(not HAS_REGIONS, reason='regions is required')
     @pytest.mark.parametrize('field_l', [['ID'],
                                          ['ID', 'moc_sky_fraction'],
                                          ['data_ucd', 'vizier_popularity', 'ID'],
@@ -65,8 +65,6 @@ def test_field_l_param(self, field_l):
     """
 
     # test of moc_order payload
-    @pytest.mark.skipif('mocpy' not in sys.modules,
-                        reason="requires MOCPy")
     @pytest.mark.parametrize('moc_order', [5, 10])
     def test_moc_order_param(self, moc_order, tmp_cwd):
 

astroquery/esa/xmm_newton/tests/test_xmm_newton_remote.py

@@ -190,7 +190,7 @@ def test_get_epic_metadata(self):
                                                radius))
         assert report_diff_values(slew_source, table)
 
-    def test_download_proprietary_data_incorrect_credentials(self):
+    def test_download_proprietary_data_incorrect_credentials(self, tmp_cwd):
         parameters = {'observation_id': "0762470101",
                       'prop': 'True',
                       'credentials_file': "astroquery/esa/xmm_newton/tests/data/dummy_config.ini",
@@ -204,7 +204,7 @@ def test_download_proprietary_data_incorrect_credentials(self):
         with pytest.raises(LoginError):
             xsa.download_data(**parameters)
 
-    def test_download_proprietary_data_without_credentials(self):
+    def test_download_proprietary_data_without_credentials(self, tmp_cwd):
         parameters = {'observation_id': "0883780101",
                       'level': "PPS",
                       'name': 'OBSMLI',

astroquery/tests/test_cache.py

@@ -1,5 +1,6 @@
 import requests
 import os
+import pytest
 
 from time import mktime
 from datetime import datetime
@@ -15,6 +16,10 @@
 TEXT1 = "Penguin"
 TEXT2 = "Walrus"
 
+pytest.skip(reason='request function mocking is buggy here, skipping tests until '
+            'https://github.com/astropy/astroquery/issues/2632 is resolved',
+            allow_module_level=True)
+
 
 def set_response(resp_text, resp_status=200):
     """Function that allows us to set a specific mock response for cache testing"""