Merge pull request #837 from astrofrog/fix-pytest-3

Fix compatibility with pytest 3.x
astropy · Jan 30, 2017 · 12de93c · 12de93c
2 parents ee9d8d9 + 5580043
commit 12de93c
Show file tree

Hide file tree

Showing 25 changed files with 165 additions and 41 deletions.
diff --git a/astroquery/alfalfa/tests/test_alfalfa.py b/astroquery/alfalfa/tests/test_alfalfa.py
@@ -27,7 +27,10 @@ def close(self):
 
 @pytest.fixture
 def patch_get(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    try:
+        mp = request.getfixturevalue("monkeypatch")
+    except AttributeError:  # pytest < 3
+        mp = request.getfuncargvalue("monkeypatch")
     mp.setattr(requests, 'get', get_mockreturn)
     return mp
 
@@ -38,7 +41,10 @@ def patch_get_readable_fileobj(request):
     def get_readable_fileobj_mockreturn(filename, **kwargs):
         file_obj = data_path(DATA_FILES['spectrum'])  # TODO: add images option
         yield open(file_obj, 'rb')  # read as bytes, assuming FITS
-    mp = request.getfuncargvalue("monkeypatch")
+    try:
+        mp = request.getfixturevalue("monkeypatch")
+    except AttributeError:  # pytest < 3
+        mp = request.getfuncargvalue("monkeypatch")
     mp.setattr(commons, 'get_readable_fileobj',
                get_readable_fileobj_mockreturn)
     return mp

diff --git a/astroquery/besancon/tests/test_besancon.py b/astroquery/besancon/tests/test_besancon.py
@@ -53,7 +53,10 @@ def test_reader(filename, length, ncols, d1, mv1):
 
 @pytest.fixture
 def patch_post(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    try:
+        mp = request.getfixturevalue("monkeypatch")
+    except AttributeError:  # pytest < 3
+        mp = request.getfuncargvalue("monkeypatch")
     mp.setattr(besancon.Besancon, '_request', post_mockreturn)
     return mp
 
@@ -70,7 +73,10 @@ def get_readable_fileobj_mockreturn(filename, **kwargs):
         else:
             file_obj = filename
         yield file_obj
-    mp = request.getfuncargvalue("monkeypatch")
+    try:
+        mp = request.getfixturevalue("monkeypatch")
+    except AttributeError:  # pytest < 3
+        mp = request.getfuncargvalue("monkeypatch")
     mp.setattr(commons, 'get_readable_fileobj',
                get_readable_fileobj_mockreturn)
     return mp

diff --git a/astroquery/esasky/tests/test_esasky.py b/astroquery/esasky/tests/test_esasky.py
@@ -29,7 +29,10 @@ def nonremote_request(request_type, url, **kwargs):
 
 @pytest.fixture
 def esasky_request(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    try:
+        mp = request.getfixturevalue("monkeypatch")
+    except AttributeError:  # pytest < 3
+        mp = request.getfuncargvalue("monkeypatch")
     mp.setattr(ESASky, '_request', nonremote_request)
     return mp
 

diff --git a/astroquery/eso/tests/test_eso.py b/astroquery/eso/tests/test_eso.py
@@ -31,7 +31,10 @@ def eso_request(request_type, url, **kwargs):
 
 # @pytest.fixture
 # def patch_get(request):
-#    mp = request.getfuncargvalue("monkeypatch")
+#    try:
+#        mp = request.getfixturevalue("monkeypatch")
+#    except AttributeError:  # pytest < 3
+#        mp = request.getfuncargvalue("monkeypatch")
 #    mp.setattr(Eso, 'request', eso_request)
 #    return mp
 

diff --git a/astroquery/fermi/tests/test_fermi.py b/astroquery/fermi/tests/test_fermi.py
@@ -21,7 +21,10 @@ def data_path(filename):
 
 @pytest.fixture
 def patch_post(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    try:
+        mp = request.getfixturevalue("monkeypatch")
+    except AttributeError:  # pytest < 3
+        mp = request.getfuncargvalue("monkeypatch")
     mp.setattr(fermi.FermiLAT, '_request', post_mockreturn)
     mp.setattr(requests, 'post', post_mockreturn)
     return mp

diff --git a/astroquery/ibe/tests/test_ibe.py b/astroquery/ibe/tests/test_ibe.py
@@ -33,7 +33,10 @@ def data_path(filename):
 
 @pytest.fixture
 def patch_get(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    try:
+        mp = request.getfixturevalue("monkeypatch")
+    except AttributeError:  # pytest < 3
+        mp = request.getfuncargvalue("monkeypatch")
     mp.setattr(requests.Session, 'request', get_mockreturn)
     return mp
 

diff --git a/astroquery/irsa/tests/test_irsa.py b/astroquery/irsa/tests/test_irsa.py
@@ -31,7 +31,10 @@ def data_path(filename):
 
 @pytest.fixture
 def patch_get(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    try:
+        mp = request.getfixturevalue("monkeypatch")
+    except AttributeError:  # pytest < 3
+        mp = request.getfuncargvalue("monkeypatch")
     mp.setattr(irsa.Irsa, '_request', get_mockreturn)
     return mp
 

diff --git a/astroquery/irsa_dust/tests/test_irsa_dust.py b/astroquery/irsa_dust/tests/test_irsa_dust.py
@@ -48,15 +48,21 @@ def format(coord):
 
 @pytest.fixture
 def patch_request(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    try:
+        mp = request.getfixturevalue("monkeypatch")
+    except AttributeError:  # pytest < 3
+        mp = request.getfuncargvalue("monkeypatch")
     mp.setattr(irsa_dust.IrsaDustClass, '_request',
                TestDust().send_request_mockreturn)
     return mp
 
 
 @pytest.fixture
 def patch_fromname(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    try:
+        mp = request.getfixturevalue("monkeypatch")
+    except AttributeError:  # pytest < 3
+        mp = request.getfuncargvalue("monkeypatch")
 
     def fromname(self, name):
         if isinstance(name, str):

diff --git a/astroquery/lcogt/tests/test_lcogt.py b/astroquery/lcogt/tests/test_lcogt.py
@@ -30,7 +30,10 @@ def data_path(filename):
 
 @pytest.fixture
 def patch_get(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    try:
+        mp = request.getfixturevalue("monkeypatch")
+    except AttributeError:  # pytest < 3
+        mp = request.getfuncargvalue("monkeypatch")
     mp.setattr(lcogt.core.Lcogt, '_request', get_mockreturn)
     return mp
 

diff --git a/astroquery/magpis/tests/test_magpis.py b/astroquery/magpis/tests/test_magpis.py
@@ -24,14 +24,20 @@ def data_path(filename):
 def patch_parse_coordinates(request):
     def parse_coordinates_mock_return(c):
         return c
-    mp = request.getfuncargvalue("monkeypatch")
+    try:
+        mp = request.getfixturevalue("monkeypatch")
+    except AttributeError:  # pytest < 3
+        mp = request.getfuncargvalue("monkeypatch")
     mp.setattr(commons, 'parse_coordinates', parse_coordinates_mock_return)
     return mp
 
 
 @pytest.fixture
 def patch_post(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    try:
+        mp = request.getfixturevalue("monkeypatch")
+    except AttributeError:  # pytest < 3
+        mp = request.getfuncargvalue("monkeypatch")
     mp.setattr(magpis.Magpis, '_request', post_mockreturn)
     return mp
 

diff --git a/astroquery/ned/tests/test_ned.py b/astroquery/ned/tests/test_ned.py
@@ -40,7 +40,10 @@ def data_path(filename):
 
 @pytest.fixture
 def patch_get(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    try:
+        mp = request.getfixturevalue("monkeypatch")
+    except AttributeError:  # pytest < 3
+        mp = request.getfuncargvalue("monkeypatch")
     mp.setattr(ned.Ned, '_request', get_mockreturn)
     return mp
 
@@ -53,7 +56,10 @@ def get_readable_fileobj_mockreturn(filename, cache=True, encoding=None,
         # otherwise
         assert encoding == 'binary'
         return open(data_path(DATA_FILES['image']), 'rb')
-    mp = request.getfuncargvalue("monkeypatch")
+    try:
+        mp = request.getfixturevalue("monkeypatch")
+    except AttributeError:  # pytest < 3
+        mp = request.getfuncargvalue("monkeypatch")
     mp.setattr(commons, 'get_readable_fileobj',
                get_readable_fileobj_mockreturn)
     return mp

diff --git a/astroquery/nist/tests/test_nist.py b/astroquery/nist/tests/test_nist.py
@@ -19,7 +19,10 @@ def data_path(filename):
 
 @pytest.fixture
 def patch_get(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    try:
+        mp = request.getfixturevalue("monkeypatch")
+    except AttributeError:  # pytest < 3
+        mp = request.getfuncargvalue("monkeypatch")
     mp.setattr(nist.Nist, '_request', get_mockreturn)
     return mp
 

diff --git a/astroquery/nrao/tests/test_nrao.py b/astroquery/nrao/tests/test_nrao.py
@@ -25,14 +25,20 @@ def data_path(filename):
 def patch_parse_coordinates(request):
     def parse_coordinates_mock_return(c):
         return c
-    mp = request.getfuncargvalue("monkeypatch")
+    try:
+        mp = request.getfixturevalue("monkeypatch")
+    except AttributeError:  # pytest < 3
+        mp = request.getfuncargvalue("monkeypatch")
     mp.setattr(commons, 'parse_coordinates', parse_coordinates_mock_return)
     return mp
 
 
 @pytest.fixture
 def patch_post(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    try:
+        mp = request.getfixturevalue("monkeypatch")
+    except AttributeError:  # pytest < 3
+        mp = request.getfuncargvalue("monkeypatch")
     mp.setattr(requests.Session, 'request', post_mockreturn)
     return mp
 

diff --git a/astroquery/nvas/tests/test_nvas.py b/astroquery/nvas/tests/test_nvas.py
@@ -29,7 +29,10 @@ def data_path(filename):
 
 @pytest.fixture
 def patch_post(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    try:
+        mp = request.getfixturevalue("monkeypatch")
+    except AttributeError:  # pytest < 3
+        mp = request.getfuncargvalue("monkeypatch")
     mp.setattr(nvas.Nvas, '_request', post_mockreturn)
     return mp
 
@@ -38,7 +41,10 @@ def patch_post(request):
 def patch_parse_coordinates(request):
     def parse_coordinates_mock_return(c):
         return c
-    mp = request.getfuncargvalue("monkeypatch")
+    try:
+        mp = request.getfixturevalue("monkeypatch")
+    except AttributeError:  # pytest < 3
+        mp = request.getfuncargvalue("monkeypatch")
     mp.setattr(commons, 'parse_coordinates', parse_coordinates_mock_return)
     return mp
 
@@ -61,7 +67,10 @@ def get_readable_fileobj_mockreturn(filename, **kwargs):
             file_obj = open(data_path(DATA_FILES["image"]),
                             "r", encoding=encoding)
         yield file_obj
-    mp = request.getfuncargvalue("monkeypatch")
+    try:
+        mp = request.getfixturevalue("monkeypatch")
+    except AttributeError:  # pytest < 3
+        mp = request.getfuncargvalue("monkeypatch")
     mp.setattr(commons, 'get_readable_fileobj',
                get_readable_fileobj_mockreturn)
     return mp

diff --git a/astroquery/ogle/tests/test_ogle.py b/astroquery/ogle/tests/test_ogle.py
@@ -18,7 +18,10 @@ def data_path(filename):
 
 @pytest.fixture
 def patch_post(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    try:
+        mp = request.getfixturevalue("monkeypatch")
+    except AttributeError:  # pytest < 3
+        mp = request.getfuncargvalue("monkeypatch")
     mp.setattr(ogle.Ogle, '_request', post_mockreturn)
     return mp
 

diff --git a/astroquery/sdss/tests/test_sdss.py b/astroquery/sdss/tests/test_sdss.py
@@ -26,21 +26,30 @@
 
 @pytest.fixture
 def patch_get(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    try:
+        mp = request.getfixturevalue("monkeypatch")
+    except AttributeError:  # pytest < 3
+        mp = request.getfuncargvalue("monkeypatch")
     mp.setattr(sdss.SDSS, '_request', get_mockreturn)
     return mp
 
 
 @pytest.fixture
 def patch_post(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    try:
+        mp = request.getfixturevalue("monkeypatch")
+    except AttributeError:  # pytest < 3
+        mp = request.getfuncargvalue("monkeypatch")
     mp.setattr(sdss.SDSS, '_request', post_mockreturn)
     return mp
 
 
 @pytest.fixture
 def patch_get_slow(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    try:
+        mp = request.getfixturevalue("monkeypatch")
+    except AttributeError:  # pytest < 3
+        mp = request.getfuncargvalue("monkeypatch")
     mp.setattr(sdss.SDSS, '_request', get_mockreturn_slow)
     return mp
 
@@ -56,7 +65,10 @@ def get_readable_fileobj_mockreturn(filename, **kwargs):
         else:
             yield open(file_obj, 'r', encoding=encoding)
 
-    mp = request.getfuncargvalue("monkeypatch")
+    try:
+        mp = request.getfixturevalue("monkeypatch")
+    except AttributeError:  # pytest < 3
+        mp = request.getfuncargvalue("monkeypatch")
     mp.setattr(commons, 'get_readable_fileobj',
                get_readable_fileobj_mockreturn)
     return mp
@@ -70,7 +82,10 @@ def get_readable_fileobj_mockreturn(filename, **kwargs):
         e.reason = socket.timeout()
         raise e
         yield True
-    mp = request.getfuncargvalue("monkeypatch")
+    try:
+        mp = request.getfixturevalue("monkeypatch")
+    except AttributeError:  # pytest < 3
+        mp = request.getfuncargvalue("monkeypatch")
     mp.setattr(commons, 'get_readable_fileobj',
                get_readable_fileobj_mockreturn)
     return mp

diff --git a/astroquery/sha/tests/test_sha.py b/astroquery/sha/tests/test_sha.py
@@ -40,7 +40,10 @@ def get_mockreturn(url, params=None, stream=False, timeout=10, **kwargs):
 
 @pytest.fixture
 def patch_get(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    try:
+        mp = request.getfixturevalue("monkeypatch")
+    except AttributeError:  # pytest < 3
+        mp = request.getfuncargvalue("monkeypatch")
     mp.setattr(requests, 'get', get_mockreturn)
     return mp
 

diff --git a/astroquery/simbad/tests/test_simbad.py b/astroquery/simbad/tests/test_simbad.py
@@ -58,7 +58,10 @@ def data_path(filename):
 
 @pytest.fixture
 def patch_post(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    try:
+        mp = request.getfixturevalue("monkeypatch")
+    except AttributeError:  # pytest < 3
+        mp = request.getfuncargvalue("monkeypatch")
     mp.setattr(simbad.SimbadClass, '_request', post_mockreturn)
     return mp
 

diff --git a/astroquery/skyview/tests/test_skyview.py b/astroquery/skyview/tests/test_skyview.py
@@ -17,7 +17,11 @@
 
 @pytest.fixture
 def patch_fromname(request):
-    mp = request.getfuncargvalue("monkeypatch")
+
+    try:
+        mp = request.getfixturevalue("monkeypatch")
+    except AttributeError:  # pytest < 3
+        mp = request.getfuncargvalue("monkeypatch")
 
     def fromname(self, name):
         if isinstance(name, str):
@@ -61,7 +65,10 @@ def data_path(filename):
 
 @pytest.fixture
 def patch_get(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    try:
+        mp = request.getfixturevalue("monkeypatch")
+    except AttributeError:  # pytest < 3
+        mp = request.getfuncargvalue("monkeypatch")
     mp.setattr(SkyView, '_request', MockResponseSkyviewForm)
     return mp
 

diff --git a/astroquery/splatalogue/tests/test_splatalogue.py b/astroquery/splatalogue/tests/test_splatalogue.py
@@ -17,7 +17,10 @@ def data_path(filename):
 
 @pytest.fixture
 def patch_post(request):
-    mp = request.getfuncargvalue("monkeypatch")
+    try:
+        mp = request.getfixturevalue("monkeypatch")
+    except AttributeError:  # pytest < 3
+        mp = request.getfuncargvalue("monkeypatch")
     mp.setattr(requests.Session, 'request', post_mockreturn)
     return mp