From f64fd36bb0db9125de9e144b4732a66e4b661020 Mon Sep 17 00:00:00 2001 From: Aron Mirwald Date: Wed, 21 Jun 2023 09:38:17 +0200 Subject: [PATCH] adjust test functions for download --- .../download/tests/test_download_catalogs.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/catalog_tools/download/tests/test_download_catalogs.py b/catalog_tools/download/tests/test_download_catalogs.py index 7d421c2..875c714 100644 --- a/catalog_tools/download/tests/test_download_catalogs.py +++ b/catalog_tools/download/tests/test_download_catalogs.py @@ -6,7 +6,7 @@ from numpy.testing import assert_equal, assert_allclose, assert_array_less from catalog_tools.download.download_catalogs import apply_edwards, \ - download_catalog_sed, prepare_sed_catalog + download_catalog_sed, prepare_sed_catalog, download_catalog_1 def test_apply_edwards(): @@ -46,7 +46,7 @@ def test_download_catalog_sed(mock_get): # check that the downloaded catalog is correct assert_equal( [len(ch_cat), len(ch_cat.query("EventType != 'earthquake'"))], - [1274, 18]) + [1256, 0]) @mock.patch('urllib.request.urlopen', side_effect=mocked_requests_get) @@ -56,8 +56,12 @@ def test_prepare_sed_catalog(mock_get): end_time = dt.datetime(2022, 1, 1) delta_m = 0.1 - ch_cat = download_catalog_sed(start_time=start_time, end_time=end_time, - min_magnitude=min_mag) + base_query = 'http://arclink.ethz.ch/fdsnws/event/1/query?' + ch_cat = download_catalog_1( + base_query=base_query, + start_time=start_time, + end_time=end_time, + min_magnitude=min_mag) df = prepare_sed_catalog( ch_cat,