INTEGRALSWRQ-158: tests for utils

Author: jespinosaar

astroquery/esa/integral/core.py

@@ -325,7 +325,7 @@ def get_observations(self, *, target_name=None, coordinates=None, radius=14.0, s
                                   output_format=output_format)
 
     def download_science_windows(self, *, science_windows=None, observation_id=None, revolution=None, proposal=None,
-                                 output_file=None, read_fits=True):
+                                 output_file=None, cache=False, read_fits=True):
         """Method to download science windows associated to one of these parameters:
         science_windows, observation_id, revolution or proposal
 
@@ -341,6 +341,8 @@ def download_science_windows(self, *, science_windows=None, observation_id=None,
             Proposal ID associated to science windows
         output_file: str, optional
             File name and path for the downloaded file
+        cache: bool, optional, default False
+                Flag to determine if the file is stored in the cache or not
         read_fits: bool, optional, default True
             Open the downloaded file and parse the existing FITS files
 
@@ -355,7 +357,8 @@ def download_science_windows(self, *, science_windows=None, observation_id=None,
         try:
 
             downloaded_file = esautils.download_file(url=conf.ISLA_DATA_SERVER, session=self.tap._session,
-                                                     filename=output_file, params=params, verbose=True)
+                                                     filename=output_file, params=params,
+                                                     cache=cache, cache_folder=self.cache_location, verbose=True)
             if read_fits:
                 return esautils.read_downloaded_fits([downloaded_file])
             else:

astroquery/esa/integral/tests/data/st.tar

@@ -412,7 +412,7 @@ def test_get_long_term_timeseries_exception(self, instrument_band_mock, log_mock
     @patch('astroquery.esa.integral.core.IntegralClass.get_instrument_band_map')
     def test_get_long_term_timeseries(self, instrument_band_mock, download_mock):
         instrument_band_mock.return_value = mocks.get_instrument_bands()
-        download_mock.return_value = data_path('lt.zip')
+        download_mock.return_value = data_path('zip_file.zip')
 
         isla = IntegralClass()
         mock_instrument_bands(isla_module=isla)
@@ -421,7 +421,6 @@ def test_get_long_term_timeseries(self, instrument_band_mock, download_mock):
         assert len(lt_timeseries_list_extracted) == 2
         lt_timeseries_list_compressed = isla.get_long_term_timeseries(target_name='J174537.0-290107', band='b1',
                                                                       read_fits=False)
-
         assert type(lt_timeseries_list_compressed) is str
         close_files(lt_timeseries_list_extracted)
 
@@ -483,7 +482,7 @@ def test_get_short_term_timeseries(self, instrument_band_mock, epoch_mock, downl
 
         instrument_band_mock.return_value = mocks.get_instrument_bands()
         epoch_mock.return_value = {'epoch': ['time']}
-        download_mock.return_value = data_path('st.tar')
+        download_mock.return_value = data_path('tar_file.tar')
 
         isla = IntegralClass()
         mock_instrument_bands(isla_module=isla)
@@ -559,7 +558,7 @@ def test_get_spectra(self, instrument_band_mock, servlet_mock, epoch_mock, downl
         instrument_band_mock.return_value = mocks.get_instrument_bands()
         servlet_mock.return_value = mocks.get_mock_spectra()
         epoch_mock.return_value = {'epoch': ['today']}
-        download_mock.return_value = data_path('spectra.tar')
+        download_mock.return_value = data_path('tar_file.tar')
 
         isla = IntegralClass()
         mock_instrument_bands(isla_module=isla)
@@ -615,7 +614,7 @@ def test_get_mosaic(self, instrument_band_mock, servlet_mock, epoch_mock, downlo
         instrument_band_mock.return_value = mocks.get_instrument_bands()
         servlet_mock.return_value = mocks.get_mock_mosaic()
         epoch_mock.return_value = {'epoch': ['today']}
-        download_mock.return_value = data_path('mosaic.tar.gz')
+        download_mock.return_value = data_path('tar_gz_file.gz')
 
         isla = IntegralClass()
         mock_instrument_bands(isla_module=isla)