Import MockResponse directly from utils.mocks

eerovaher · eerovaher · commit cfa2913d03a2 · 2022-02-07T18:14:18.000+01:00
The `MockResponse` class utilised in many tests is defined in
`astroquery.utils.mocks`, but many modules imported it via
`astroquery.utils.testing_tools`.
diff --git a/astroquery/alfalfa/tests/test_alfalfa.py b/astroquery/alfalfa/tests/test_alfalfa.py
@@ -5,7 +5,7 @@
 from astropy import coordinates
 import pytest
 from ...utils import commons
-from ...utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 from ... import alfalfa
 
 DATA_FILES = {'catalog': 'alfalfa_cat_small.txt',
diff --git a/astroquery/besancon/tests/test_besancon.py b/astroquery/besancon/tests/test_besancon.py
@@ -6,7 +6,7 @@
 from astropy.io.ascii.tests.common import assert_equal
 from ... import besancon
 from ...utils import commons
-from ...utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 
 # SKIP - don't run tests because Besancon folks don't want them (based on
 # the fact that your@email.net is now rejected)
diff --git a/astroquery/cds/tests/test_mocserver.py b/astroquery/cds/tests/test_mocserver.py
@@ -21,7 +21,7 @@
     HAS_REGIONS = False
 
 from ..core import cds
-from ...utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 
 
 DATA_FILES = {
diff --git a/astroquery/esa/hubble/tests/test_esa_hubble.py b/astroquery/esa/hubble/tests/test_esa_hubble.py
@@ -17,7 +17,7 @@
 from requests.models import Response
 from astroquery.esa.hubble import ESAHubbleClass
 from astroquery.esa.hubble.tests.dummy_tap_handler import DummyHubbleTapHandler
-from astroquery.utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 from astropy import coordinates
 from unittest.mock import MagicMock
 from astropy.table.table import Table
diff --git a/astroquery/eso/tests/test_eso.py b/astroquery/eso/tests/test_eso.py
@@ -1,6 +1,6 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 import os
-from ...utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 
 from ...eso import Eso
 
diff --git a/astroquery/fermi/tests/test_fermi.py b/astroquery/fermi/tests/test_fermi.py
@@ -4,7 +4,7 @@
 import requests
 import pytest
 import astropy.coordinates as coord
-from ...utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 from ... import fermi
 
 DATA_FILES = {'async': "query_result_m31.html",
diff --git a/astroquery/image_cutouts/first/tests/test_first.py b/astroquery/image_cutouts/first/tests/test_first.py
@@ -6,7 +6,7 @@
 import astropy.units as u
 
 from ....utils import commons
-from ....utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 from ... import first
 
 DATA_FILES = {'image': 'image.fits'}
diff --git a/astroquery/imcce/tests/test_miriade.py b/astroquery/imcce/tests/test_miriade.py
@@ -4,7 +4,7 @@
 import os
 
 import astropy.units as u
-from ...utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 
 from .. import Miriade, MiriadeClass
 
diff --git a/astroquery/imcce/tests/test_skybot.py b/astroquery/imcce/tests/test_skybot.py
@@ -3,7 +3,7 @@
 import pytest
 import os
 
-from astroquery.utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 import astropy.units as u
 from astropy.time import Time
 from astropy.coordinates import SkyCoord, Angle
diff --git a/astroquery/ipac/irsa/ibe/tests/test_ibe.py b/astroquery/ipac/irsa/ibe/tests/test_ibe.py
@@ -8,7 +8,7 @@
 from astropy.coordinates import SkyCoord
 import astropy.units as u
 
-from astroquery.utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 from astroquery.ipac.irsa.ibe import Ibe
 
 DATA_FILES = {
diff --git a/astroquery/ipac/irsa/sha/tests/test_sha.py b/astroquery/ipac/irsa/sha/tests/test_sha.py
@@ -4,7 +4,7 @@
 import requests
 
 from astroquery.ipac.irsa import sha
-from astroquery.utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 
 DATA_FILES = {'img': 'img.fits',
               'nid_t': 'nid_t.txt',
diff --git a/astroquery/ipac/irsa/tests/test_irsa.py b/astroquery/ipac/irsa/tests/test_irsa.py
@@ -9,7 +9,7 @@
 import astropy.coordinates as coord
 import astropy.units as u
 
-from astroquery.utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 from astroquery.utils import commons
 from astroquery.ipac.irsa import Irsa, conf
 from astroquery.ipac import irsa
diff --git a/astroquery/ipac/ned/tests/test_ned.py b/astroquery/ipac/ned/tests/test_ned.py
@@ -8,7 +8,7 @@
 import astropy.coordinates as coord
 import astropy.units as u
 from astroquery.exceptions import RemoteServiceError
-from astroquery.utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 
 from astroquery.ipac import ned
 from astroquery.utils import commons
diff --git a/astroquery/ipac/nexsci/nasa_exoplanet_archive/tests/test_nasa_exoplanet_archive.py b/astroquery/ipac/nexsci/nasa_exoplanet_archive/tests/test_nasa_exoplanet_archive.py
@@ -13,7 +13,7 @@
 from astropy.utils.exceptions import AstropyDeprecationWarning
 
 from astroquery.exceptions import NoResultsWarning
-from astroquery.utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 from astroquery.ipac.nexsci.nasa_exoplanet_archive.core import NasaExoplanetArchiveClass, conf, InvalidTableError
 try:
     from unittest.mock import Mock, patch, PropertyMock
diff --git a/astroquery/jplhorizons/tests/test_jplhorizons.py b/astroquery/jplhorizons/tests/test_jplhorizons.py
@@ -9,7 +9,7 @@
 from astropy.tests.helper import assert_quantity_allclose
 from astropy.utils.exceptions import AstropyDeprecationWarning
 
-from ...utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 from ...query import AstroQuery
 from ...exceptions import TableParseError
 from ... import jplhorizons
diff --git a/astroquery/jplsbdb/tests/test_jplsbdb.py b/astroquery/jplsbdb/tests/test_jplsbdb.py
@@ -3,7 +3,7 @@
 import pytest
 import os
 
-from astroquery.utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 import astropy.units as u
 from astropy.tests.helper import assert_quantity_allclose
 from .. import SBDB, SBDBClass
diff --git a/astroquery/magpis/tests/test_magpis.py b/astroquery/magpis/tests/test_magpis.py
@@ -7,7 +7,7 @@
 import astropy.units as u
 
 from ...utils import commons
-from ...utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 from ... import magpis
 
 DATA_FILES = {'image': 'image.fits'}
diff --git a/astroquery/mast/tests/test_mast.py b/astroquery/mast/tests/test_mast.py
@@ -12,7 +12,7 @@
 
 import astropy.units as u
 
-from ...utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 from ...exceptions import InvalidQueryError, InputWarning
 
 from ... import mast
diff --git a/astroquery/mpc/tests/test_mpc.py b/astroquery/mpc/tests/test_mpc.py
@@ -52,7 +52,7 @@
 
 from ...exceptions import InvalidQueryError
 from ... import mpc
-from ...utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 from requests import Request
 
 
diff --git a/astroquery/nasa_ads/tests/test_nasaads.py b/astroquery/nasa_ads/tests/test_nasaads.py
@@ -2,7 +2,7 @@
 import requests
 import pytest
 from ... import nasa_ads
-from ...utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 
 
 class MockResponseADS(MockResponse):
diff --git a/astroquery/nist/tests/test_nist.py b/astroquery/nist/tests/test_nist.py
@@ -6,7 +6,7 @@
 from astropy.table import Table
 import astropy.units as u
 
-from ...utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 from ... import nist
 
 DATA_FILES = {'lines': 'nist_out.html'}
diff --git a/astroquery/nrao/tests/test_nrao.py b/astroquery/nrao/tests/test_nrao.py
@@ -8,7 +8,7 @@
 from astropy.table import Table
 
 from ... import nrao
-from ...utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 from ...utils import commons
 
 
diff --git a/astroquery/nvas/tests/test_nvas.py b/astroquery/nvas/tests/test_nvas.py
@@ -10,7 +10,7 @@
 import pytest
 
 from ...import nvas
-from ...utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 from ...utils import commons
 
 COORDS_GAL = commons.GalacticCoordGenerator(
diff --git a/astroquery/oac/tests/test_oac.py b/astroquery/oac/tests/test_oac.py
@@ -6,7 +6,7 @@
 import astropy.coordinates as coord
 import astropy.units as u
 
-from ...utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 
 from .. import OAC
 
diff --git a/astroquery/ogle/tests/test_ogle.py b/astroquery/ogle/tests/test_ogle.py
@@ -5,7 +5,7 @@
 import pytest
 from astropy.coordinates import SkyCoord
 from astropy import units as u
-from ...utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 
 DATA_FILES = {'gal_0_3': 'gal_0_3.txt'}
 
diff --git a/astroquery/sdss/tests/test_sdss.py b/astroquery/sdss/tests/test_sdss.py
@@ -11,7 +11,7 @@
 import pytest
 
 from ... import sdss
-from ...utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 from ...exceptions import TimeoutError
 from ...utils import commons
 
diff --git a/astroquery/simbad/tests/test_simbad.py b/astroquery/simbad/tests/test_simbad.py
@@ -8,7 +8,7 @@
 import numpy as np
 
 from ... import simbad
-from ...utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 from ...utils import commons
 from ...query import AstroQuery
 from ...exceptions import TableParseError
diff --git a/astroquery/simbad/tests/test_simbad_remote.py b/astroquery/simbad/tests/test_simbad_remote.py
@@ -6,7 +6,7 @@
 from astropy.coordinates import SkyCoord
 import astropy.units as u
 from astropy.table import Table
-from astroquery.utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 from astroquery.simbad import Simbad
 # Maybe we need to expose SimbadVOTableResult to be in the public API?
 from astroquery.simbad.core import SimbadVOTableResult
diff --git a/astroquery/skyview/tests/test_skyview.py b/astroquery/skyview/tests/test_skyview.py
@@ -7,7 +7,7 @@
 from astropy import units as u
 
 from ...utils import commons
-from ...utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 from ...skyview import SkyView
 
 objcoords = {'Eta Carinae': coordinates.SkyCoord(ra=161.264775 * u.deg,
diff --git a/astroquery/splatalogue/tests/test_splatalogue.py b/astroquery/splatalogue/tests/test_splatalogue.py
@@ -7,7 +7,7 @@
 from astropy import units as u
 
 from ... import splatalogue
-from ...utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 
 SPLAT_DATA = 'CO_colons.csv'
 
diff --git a/astroquery/svo_fps/tests/test_svo_fps.py b/astroquery/svo_fps/tests/test_svo_fps.py
@@ -2,7 +2,7 @@
 import os
 from astropy import units as u
 
-from ...utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 from ..core import SvoFps
 
 DATA_FILES = {'filter_index': 'svo_fps_WavelengthEff_min=12000_WavelengthEff_max=12100.xml',
diff --git a/astroquery/template_module/tests/test_module.py b/astroquery/template_module/tests/test_module.py
@@ -18,7 +18,7 @@
 import astropy.coordinates as coord
 import astropy.units as u
 
-from ...utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 
 # finally import the module which is to be tested
 # and the various configuration items created
diff --git a/astroquery/ukidss/tests/test_ukidss.py b/astroquery/ukidss/tests/test_ukidss.py
@@ -9,7 +9,7 @@
 
 from ... import ukidss
 from ...utils import commons
-from ...utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 from ...exceptions import InvalidQueryError
 
 DATA_FILES = {"vo_results": "vo_results.html",
diff --git a/astroquery/utils/mocks.py b/astroquery/utils/mocks.py
@@ -3,7 +3,7 @@
 import json
 
 # The MockResponse class is currently relied upon in code and thus
-# temporarily got moved out of testing_tools to avoid adding pytest as a
+# temporarily got moved here to avoid adding pytest as a
 # mandatory dependency
 
 
diff --git a/astroquery/vizier/tests/test_vizier.py b/astroquery/vizier/tests/test_vizier.py
@@ -8,7 +8,7 @@
 
 from ... import vizier
 from ...utils import commons
-from ...utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 
 
 VO_DATA = {'HIP,NOMAD,UCAC': "viz.xml",
diff --git a/astroquery/xmatch/tests/test_xmatch.py b/astroquery/xmatch/tests/test_xmatch.py
@@ -8,7 +8,7 @@
 from astropy.units import arcsec
 
 from ...utils import commons
-from ...utils.testing_tools import MockResponse
+from astroquery.utils.mocks import MockResponse
 from ...xmatch import XMatch
 
 DATA_FILES = {
