Merge pull request #2468 from eerovaher/xmatch-remote-tests-Path

TST: `xmatch` test improvements

Author: bsipocz

astroquery/xmatch/tests/test_xmatch.py

@@ -1,5 +1,5 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
-import os.path
+from pathlib import Path
 
 import requests
 import pytest
@@ -11,6 +11,7 @@
 from astroquery.utils.mocks import MockResponse
 from ...xmatch import XMatch
 
+DATA_DIR = Path(__file__).parent / "data"
 DATA_FILES = {
     'get': 'tables.csv',  # .action.getVizieRTableNames
     'post': 'query_res.csv',  # .request.xmatch
@@ -24,8 +25,8 @@ def __init__(self, method, url, data, **kwargs):
         super().__init__(**kwargs)
 
         self.data = data
-        fn = data_path(DATA_FILES[method.lower()])
-        with open(fn, 'rb') as file:
+        filename = DATA_DIR / DATA_FILES[method.lower()]
+        with open(filename, "rb") as file:
             self.content = file.read()
 
     def get_content(self):
@@ -44,11 +45,6 @@ def request_mockreturn(method, url, data, **kwargs):
     return MockResponseXmatch(method, url, data)
 
 
-def data_path(filename):
-    data_dir = os.path.join(os.path.dirname(__file__), 'data')
-    return os.path.join(data_dir, filename)
-
-
 def test_xmatch_query_invalid_max_distance():
     with pytest.raises(ValueError) as ex:
         XMatch().query_async('', '', 181 * arcsec)
@@ -84,7 +80,7 @@ def test_xmatch_query_local(monkeypatch):
         'send_request',
         lambda url, data, timeout, request_type='POST', headers={}, **kwargs:
             request_mockreturn(request_type, url, data, **kwargs))
-    with open(data_path('posList.csv')) as pos_list:
+    with open(DATA_DIR / "posList.csv") as pos_list:
         response = xm.query_async(
             cat1=pos_list, cat2='vizier:II/246/out', max_distance=5 * arcsec,
             colRA1='ra', colDec1='dec')
@@ -105,7 +101,7 @@ def test_xmatch_query_cat1_table_local(monkeypatch):
         'send_request',
         lambda url, data, timeout, request_type='POST', headers={}, **kwargs:
             request_mockreturn(request_type, url, data, **kwargs))
-    with open(data_path('posList.csv')) as pos_list:
+    with open(DATA_DIR / "posList.csv") as pos_list:
         input_table = Table.read(pos_list.readlines(),
                                  format='ascii.csv',
                                  guess=False)

astroquery/xmatch/tests/test_xmatch_remote.py

@@ -1,5 +1,5 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
-import os.path
+from pathlib import Path
 import os
 import sys
 import pytest
@@ -20,7 +20,7 @@
 from ...xmatch import XMatch
 
 
-DATA_DIR = os.path.join(os.path.dirname(__file__), 'data')
+DATA_DIR = Path(__file__).parent / "data"
 
 
 @pytest.mark.remote_data
@@ -32,6 +32,18 @@ def test_is_xmatch_up():
         pytest.xfail("XMATCH appears to be down.  Exception was: {0}".format(ex))
 
 
+@pytest.fixture(scope="module")
+def remote_table(tmp_path_factory):
+    # this can be used to check that the API is still functional & doing as expected
+    infile = DATA_DIR / "posList.csv"
+    outfile = tmp_path_factory.mktemp("remote_data") / "http_result.csv"
+    os.system("curl -X POST -F request=xmatch -F distMaxArcsec=5 -F RESPONSEFORMAT=csv "
+              "-F cat1=@{1} -F colRA1=ra -F colDec1=dec -F cat2=vizier:II/246/out  "
+              "http://cdsxmatch.u-strasbg.fr/xmatch/api/v1/sync > {0}".
+              format(outfile, infile))
+    return ascii.read(outfile, format="csv", fast_reader=False)
+
+
 @pytest.mark.remote_data
 @pytest.mark.dependency(depends=["xmatch_up"])
 class TestXMatch:
@@ -55,8 +67,8 @@ def test_xmatch_is_avail_table(self, xmatch):
         assert xmatch.is_table_available('vizier:II/311/wise')
         assert not xmatch.is_table_available('blablabla')
 
-    def test_xmatch_query(self, xmatch):
-        with open(os.path.join(DATA_DIR, 'posList.csv'), 'r') as pos_list:
+    def test_xmatch_query(self, xmatch, remote_table):
+        with open(DATA_DIR / "posList.csv", "r") as pos_list:
             try:
                 table = xmatch.query(
                     cat1=pos_list, cat2='vizier:II/246/out', max_distance=5 * arcsec,
@@ -70,12 +82,10 @@ def test_xmatch_query(self, xmatch):
             'e_Jmag', 'e_Hmag', 'e_Kmag', 'Qfl', 'Rfl', 'X', 'MeasureJD']
         assert len(table) == 11
 
-        http_test_table = self.http_test()
-        assert all(table == http_test_table)
+        assert all(table == remote_table)
 
-    def test_xmatch_query_astropy_table(self, xmatch):
-        datapath = os.path.join(DATA_DIR, 'posList.csv')
-        input_table = Table.read(datapath, format='ascii.csv')
+    def test_xmatch_query_astropy_table(self, xmatch, remote_table):
+        input_table = Table.read(DATA_DIR / "posList.csv", format="ascii.csv")
         try:
             table = xmatch.query(
                 cat1=input_table, cat2='vizier:II/246/out', max_distance=5 * arcsec,
@@ -89,8 +99,7 @@ def test_xmatch_query_astropy_table(self, xmatch):
             'e_Jmag', 'e_Hmag', 'e_Kmag', 'Qfl', 'Rfl', 'X', 'MeasureJD']
         assert len(table) == 11
 
-        http_test_table = self.http_test()
-        assert all(table == http_test_table)
+        assert all(table == remote_table)
 
     @pytest.mark.skipif('regions' not in sys.modules,
                         reason="requires astropy-regions")
@@ -102,14 +111,3 @@ def test_xmatch_query_with_cone_area(self, xmatch):
         except ReadTimeout:
             pytest.xfail("xmatch query timed out.")
         assert len(table) == 185
-
-    def http_test(self):
-        # this can be used to check that the API is still functional & doing as expected
-        infile = os.path.join(DATA_DIR, 'posList.csv')
-        outfile = os.path.join(DATA_DIR, 'http_result.csv')
-        os.system('curl -X POST -F request=xmatch -F distMaxArcsec=5 -F RESPONSEFORMAT=csv '
-                  '-F cat1=@{1} -F colRA1=ra -F colDec1=dec -F cat2=vizier:II/246/out  '
-                  'http://cdsxmatch.u-strasbg.fr/xmatch/api/v1/sync > {0}'.
-                  format(outfile, infile))
-        table = ascii.read(outfile, format='csv', fast_reader=False)
-        return table