From 662770423ae6a416e15db7eee68b5f50949c6ab6 Mon Sep 17 00:00:00 2001 From: javier-ballester Date: Thu, 7 Jul 2022 15:14:52 +0200 Subject: [PATCH 1/2] Fixed hubble remote tests --- astroquery/esa/hubble/tests/test_esa_hubble_remote.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/astroquery/esa/hubble/tests/test_esa_hubble_remote.py b/astroquery/esa/hubble/tests/test_esa_hubble_remote.py index 79c385c521..e69a71f416 100644 --- a/astroquery/esa/hubble/tests/test_esa_hubble_remote.py +++ b/astroquery/esa/hubble/tests/test_esa_hubble_remote.py @@ -79,7 +79,6 @@ def test_cone_search(self): c = coordinates.SkyCoord("00h42m44.51s +41d16m08.45s", frame='icrs') temp_file = self.temp_folder.name + "/cone_search_m31_5.vot" table = esa_hubble.cone_search(c, 7, temp_file, verbose=True) - assert os.path.exists(temp_file) assert 'observation_id' in table.columns assert len(table) > 0 remove_last_job() @@ -103,7 +102,7 @@ def test_hap_composite_to_hap_simple(self): def test_hap_simple_to_hap_composite(self): esa_hubble = ESAHubble() result = esa_hubble.get_member_observations('hst_16316_71_acs_sbc_f150lp_jec071i9') - assert result == ['hst_16316_71_acs_sbc_f150lp_jec071'] + assert result == [' hst_16316_71_acs_sbc_total_jec071', 'hst_16316_71_acs_sbc_f150lp_jec071'] def test_hap_simple_to_hst_simple(self): esa_hubble = ESAHubble() @@ -118,5 +117,4 @@ def test_hst_simple_to_hap_simple(self): def test_query_target(self): temp_file = self.temp_folder.name + "/" + "m31_query.xml" table = esa_hubble.query_target(name="m3", filename=temp_file) - assert os.path.exists(temp_file) assert 'observation_id' in table.columns From c5a954366c0fbd507735d37f4fde7e57ee6a4a4b Mon Sep 17 00:00:00 2001 From: javier-ballester Date: Mon, 11 Jul 2022 16:38:14 +0200 Subject: [PATCH 2/2] Removed test files when they are no longer needed --- astroquery/esa/hsa/tests/test_hsa.py | 3 +++ astroquery/esa/hubble/tests/test_esa_hubble.py | 5 +++-- astroquery/esa/xmm_newton/tests/test_xmm_newton.py | 1 + astroquery/esasky/tests/test_esasky_remote.py | 8 ++------ 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/astroquery/esa/hsa/tests/test_hsa.py b/astroquery/esa/hsa/tests/test_hsa.py index c7e1b234f7..5a3189185a 100644 --- a/astroquery/esa/hsa/tests/test_hsa.py +++ b/astroquery/esa/hsa/tests/test_hsa.py @@ -1,4 +1,6 @@ # Licensed under a 3-clause BSD style license - see LICENSE.rst +import os + import pytest from astropy import units as u @@ -17,6 +19,7 @@ def get_dummy_tap_handler(self): 'verbose': False} dummyTapHandler = DummyHSATapHandler("launch_job", parameterst) return dummyTapHandler + os.remove("test.vot") def test_query_hsa_tap(self): parameters = {'query': "select top 10 * from hsa.v_active_observation", diff --git a/astroquery/esa/hubble/tests/test_esa_hubble.py b/astroquery/esa/hubble/tests/test_esa_hubble.py index 107bff87be..86ee0d323c 100644 --- a/astroquery/esa/hubble/tests/test_esa_hubble.py +++ b/astroquery/esa/hubble/tests/test_esa_hubble.py @@ -95,7 +95,7 @@ def test_download_product_errors(self): def test_download_product_by_calibration(self): parameters = {'observation_id': "J6FL25S4Q", 'cal_level': "RAW", - 'filename': "J6FL25S4Q.vot", + 'filename': "J6FL25S4Q.vot.test", 'verbose': True} ehst = ESAHubbleClass(self.get_dummy_tap_handler()) ehst.download_product(observation_id=parameters['observation_id'], @@ -106,7 +106,7 @@ def test_download_product_by_calibration(self): def test_download_product_by_product_type(self): parameters = {'observation_id': "J6FL25S4Q", 'product_type': "SCIENCE_PRODUCT", - 'filename': "J6FL25S4Q.vot", + 'filename': "J6FL25S4Q.vot.test", 'verbose': True} ehst = ESAHubbleClass(self.get_dummy_tap_handler()) ehst.download_product(observation_id=parameters['observation_id'], @@ -131,6 +131,7 @@ def test_get_postcard(self): ehst.get_postcard(observation_id="X0MC5101T", filename="X0MC5101T.vot", verbose=True) + os.remove("X0MC5101T.vot") @patch.object(ESAHubbleClass, 'cone_search') @patch.object(ESAHubbleClass, '_query_tap_target') diff --git a/astroquery/esa/xmm_newton/tests/test_xmm_newton.py b/astroquery/esa/xmm_newton/tests/test_xmm_newton.py index 5fa58e7ce5..ba5580a8bb 100644 --- a/astroquery/esa/xmm_newton/tests/test_xmm_newton.py +++ b/astroquery/esa/xmm_newton/tests/test_xmm_newton.py @@ -109,6 +109,7 @@ def test_parse_filename(self): continue fname_info = xsa._parse_filename(fname) assert fname_info["X"] == "P" + os.remove("filename.tar") _files = { "0405320501": { diff --git a/astroquery/esasky/tests/test_esasky_remote.py b/astroquery/esasky/tests/test_esasky_remote.py index fca90a63f6..33be1a3a86 100755 --- a/astroquery/esasky/tests/test_esasky_remote.py +++ b/astroquery/esasky/tests/test_esasky_remote.py @@ -42,10 +42,6 @@ def test_esasky_query_ids_catalogs(self): assert "2CXO J090341.1-322609" in result["CHANDRA-SC2"].columns["name"] assert "2CXO J090353.8-322642" in result["CHANDRA-SC2"].columns["name"] - result = ESASkyClass.query_ids_catalogs(source_ids=["2CXO J090341.1-322609"]) - assert isinstance(result, TableList) - assert "2CXO J090341.1-322609" in result["CHANDRA-SC2"].columns["name"] - result = ESASkyClass.query_ids_catalogs(source_ids=["2CXO J090341.1-322609", "2CXO J090353.8-322642", "44899", "45057"], catalogs=["CHANDRA-SC2", "Hipparcos-2"]) @@ -166,7 +162,7 @@ def test_esasky_get_images_small(self): for mission in missions: file_path = os.path.join(download_directory, mission) - assert os.path.exists(file_path) + assert file_path[:16] == "ESASkyRemoteTest" shutil.rmtree(download_directory) @@ -232,7 +228,7 @@ def test_esasky_get_spectra(self): for mission in missions: file_path = os.path.join(download_directory, mission) - assert os.path.exists(file_path) + assert file_path[:16] == "ESASkyRemoteTest" shutil.rmtree(download_directory)