Merge pull request #2059 from pllim/fix-vo-conesearch-tests

TST: Fix vo_conesearch test failures

Author: bsipocz

astroquery/utils/commons.py

@@ -52,10 +52,12 @@ def FK4CoordGenerator(*args, **kwargs):
            'suppress_vo_warnings',
            'validate_email',
            'ASTROPY_LT_4_0',
-           'ASTROPY_LT_4_1']
+           'ASTROPY_LT_4_1',
+           'ASTROPY_LT_4_3']
 
 ASTROPY_LT_4_0 = not minversion('astropy', '4.0')
 ASTROPY_LT_4_1 = not minversion('astropy', '4.1')
+ASTROPY_LT_4_3 = not minversion('astropy', '4.3')
 
 
 def send_request(url, data, timeout, request_type='POST', headers={},

astroquery/utils/tests/test_utils.py

@@ -410,6 +410,11 @@ def patch_getreadablefileobj(request):
     # Monkeypatch hack: ALWAYS treat as a URL
     _is_url = aud._is_url
     aud._is_url = lambda x: True
+
+    if not commons.ASTROPY_LT_4_3:
+        _try_url_open = aud._try_url_open
+        aud._try_url_open = lambda x, **kwargs: MockRemote(x, **kwargs)
+
     _urlopen = urllib.request.urlopen
     _urlopener = urllib.request.build_opener
     _urlrequest = urllib.request.Request
@@ -457,6 +462,10 @@ def monkey_urlrequest(x, *args, **kwargs):
 
     def closing():
         aud._is_url = _is_url
+
+        if not commons.ASTROPY_LT_4_3:
+            aud._try_url_open = _try_url_open
+
         urllib.request.urlopen = _urlopen
         aud.urllib.request.urlopen = _urlopen
         urllib.request.build_opener = _urlopener