mocks, etc., are set up in conftest

Author: keflavich

astroquery/splatalogue/tests/conftest.py

@@ -28,6 +28,6 @@ def post_mockreturn(self, method, url, data=None, timeout=10, files=None,
     if method != 'POST':
         raise ValueError("A 'post request' was made with method != POST")
     filename = data_path(SPLAT_DATA)
-    with open(filename, 'r') as infile:
-        content = json.load(infile)
+    with open(filename, 'rb') as infile:
+        content = infile.read()
     return MockResponse(content, **kwargs)

astroquery/splatalogue/tests/test_splatalogue.py

@@ -10,28 +10,6 @@
 from astroquery import splatalogue
 
 
-SPLAT_DATA = 'CO.json'
-
-
-def data_path(filename):
-    data_dir = os.path.join(os.path.dirname(__file__), 'data')
-    return os.path.join(data_dir, filename)
-
-
-def mockreturn(*args, method='POST', data={}, url='', **kwargs):
-    with open(data_path("CO.json"), 'rb') as fh:
-        jdata = fh.read()
-    return MockResponse(content=jdata)
-
-
-@pytest.fixture
-def patch_post(request):
-    mp = request.getfixturevalue("monkeypatch")
-
-    mp.setattr(splatalogue.Splatalogue, '_request', mockreturn)
-    return mp
-
-
 def test_simple(patch_post):
     splatalogue.Splatalogue.query_lines(min_frequency=114 * u.GHz,
                                         max_frequency=116 * u.GHz,