Skip to content

Commit

Permalink
Using os.path for more rouboust filepath generation
Browse files Browse the repository at this point in the history
  • Loading branch information
@bsipocz
bsipocz committed Jul 20, 2022
1 parent 61226bd commit 6fa74ba
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 35 deletions.
8 changes: 4 additions & 4 deletions astroquery/esa/hubble/tests/test_esa_hubble.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def test_download_product_by_calibration(self):
tempdir = tempfile.mkdtemp("temp")
parameters = {'observation_id': "J6FL25S4Q",
'cal_level': "RAW",
'filename': tempdir + "/" + "J6FL25S4Q.vot.test",
'filename': os.path.join(tempdir, "J6FL25S4Q.vot.test"),
'verbose': True}
ehst = ESAHubbleClass(self.get_dummy_tap_handler())
ehst.download_product(observation_id=parameters['observation_id'],
Expand All @@ -109,7 +109,7 @@ def test_download_product_by_product_type(self):
tempdir = tempfile.mkdtemp("temp")
parameters = {'observation_id': "J6FL25S4Q",
'product_type': "SCIENCE_PRODUCT",
'filename': tempdir + "/" + "J6FL25S4Q.vot.test",
'filename': os.path.join(tempdir, "J6FL25S4Q.vot.test"),
'verbose': True}
ehst = ESAHubbleClass(self.get_dummy_tap_handler())
ehst.download_product(observation_id=parameters['observation_id'],
Expand All @@ -133,7 +133,7 @@ def test_get_postcard(self):
tempdir = tempfile.mkdtemp("temp")
ehst = ESAHubbleClass(self.get_dummy_tap_handler())
ehst.get_postcard(observation_id="X0MC5101T",
filename=tempdir + "/" + "X0MC5101T.vot",
filename=os.path.join(tempdir, "X0MC5101T.vot"),
verbose=True)

@patch.object(ESAHubbleClass, 'cone_search')
Expand Down Expand Up @@ -230,7 +230,7 @@ def test_get_tables(self):
def test_get_artifact(self):
tempdir = tempfile.mkdtemp("temp")
ehst = ESAHubbleClass(self.get_dummy_tap_handler())
ehst.get_artifact(tempdir + "/" + "w0ji0v01t_c2f.fits.gz")
ehst.get_artifact(os.path.join(tempdir, "w0ji0v01t_c2f.fits.gz"))

def test_get_columns(self):
parameters = {'query': "select top 10 * from hsc_v2.hubble_sc2",
Expand Down
63 changes: 32 additions & 31 deletions astroquery/esa/xmm_newton/tests/test_xmm_newton.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,10 @@ def test_dummy_handler(self):

def test_parse_filename(self):
tempdir = tempfile.mkdtemp("temp")
self._create_tar(tempdir + "/" + "filename.tar", self._files)
filename = os.path.join(tempdir, "filename.tar")
self._create_tar(filename, self._files)
xsa = XMMNewtonClass(self.get_dummy_tap_handler())
with tarfile.open(tempdir + "/" + "filename.tar", "r") as tar:
with tarfile.open(filename, "r") as tar:
for i in tar.getmembers():
paths = os.path.split(i.name)
fname = paths[1]
Expand Down Expand Up @@ -296,9 +297,9 @@ def _create_tar_lightcurves(self, tarname, files):

def test_create_tar_lightcurves(self):
tempdir = tempfile.mkdtemp("temp")
_tarname = "tarfile_lightcurves.tar"
self._create_tar_lightcurves(tempdir + "/" + _tarname, self._files_lightcurves)
assert os.path.isfile(tempdir + "/" + _tarname)
_tarpath = os.path.join(tempdir, "tarfile_lightcurves.tar")
self._create_tar_lightcurves(_tarpath, self._files_lightcurves)
assert os.path.isfile(filepath)

def test_get_epic_spectra_non_existing_file(self, capsys):
_tarname = "nonexistingfile.tar"
Expand All @@ -313,12 +314,12 @@ def test_get_epic_spectra_non_existing_file(self, capsys):

def test_get_epic_spectra_invalid_instrumnet(self, capsys):
tempdir = tempfile.mkdtemp("temp")
_tarname = "tarfile.tar"
_tarpath = os.path.join(tempdir, "tarfile.tar")
_invalid_instrument = "II"
_source_number = 83
self._create_tar(tempdir + "/" + _tarname, self._files)
self._create_tar(_tarpath, self._files)
xsa = XMMNewtonClass(self.get_dummy_tap_handler())
res = xsa.get_epic_spectra(tempdir + "/" + _tarname, _source_number,
res = xsa.get_epic_spectra(_tarpath, _source_number,
instrument=[_invalid_instrument])
assert res == {}
out, err = capsys.readouterr()
Expand All @@ -328,12 +329,12 @@ def test_get_epic_spectra_invalid_instrumnet(self, capsys):

def test_get_epic_spectra_invalid_source_number(self, capsys):
tempdir = tempfile.mkdtemp("temp")
_tarname = "tarfile.tar"
_tarpath = os.path.join(tempdir, "tarfile.tar")
_invalid_source_number = 833
_default_instrument = ['M1', 'M2', 'PN', 'EP']
self._create_tar(tempdir + "/" + _tarname, self._files)
self._create_tar(_tarpath, self._files)
xsa = XMMNewtonClass(self.get_dummy_tap_handler())
res = xsa.get_epic_spectra(tempdir + "/" + _tarname, _invalid_source_number,
res = xsa.get_epic_spectra(_tarpath, _invalid_source_number,
instrument=[])
assert res == {}
out, err = capsys.readouterr()
Expand All @@ -342,7 +343,7 @@ def test_get_epic_spectra_invalid_source_number(self, capsys):
" Source Number: %u\n"
" Instrument: %s\n"
" [astroquery.esa.xmm_newton.core]\n"
% (tempdir + "/" + _tarname, _invalid_source_number,
% (_tarpath, _invalid_source_number,
_default_instrument))

def test_get_epic_images_non_existing_file(self, capsys):
Expand All @@ -357,11 +358,11 @@ def test_get_epic_images_non_existing_file(self, capsys):

def test_get_epic_images_invalid_instrument(self, capsys):
tempdir = tempfile.mkdtemp("temp")
_tarname = "tarfile.tar"
_tarpath = os.path.join("tarfile.tar")
_invalid_instrument = "II"
self._create_tar(tempdir + "/" + _tarname, self._files)
self._create_tar(_tarpath, self._files)
xsa = XMMNewtonClass(self.get_dummy_tap_handler())
res = xsa.get_epic_images(tempdir + "/" + _tarname,
res = xsa.get_epic_images(_tarpath,
band=[], instrument=[_invalid_instrument],
get_detmask=True, get_exposure_map=True)
assert res == {}
Expand All @@ -372,11 +373,11 @@ def test_get_epic_images_invalid_instrument(self, capsys):

def test_get_epic_images_invalid_band(self, capsys):
tempdir = tempfile.mkdtemp("temp")
_tarname = "tarfile.tar"
_tarpath = os.path.join("tarfile.tar")
_invalid_band = 10
self._create_tar(tempdir + "/" + _tarname, self._files)
self._create_tar(_tarpath, self._files)
xsa = XMMNewtonClass(self.get_dummy_tap_handler())
res = xsa.get_epic_images(tempdir + "/" + _tarname,
res = xsa.get_epic_images(_tarpath,
band=[_invalid_band], instrument=[],
get_detmask=True, get_exposure_map=True)
assert res == {}
Expand All @@ -386,14 +387,14 @@ def test_get_epic_images_invalid_band(self, capsys):

def test_get_epic_images(self):
tempdir = tempfile.mkdtemp("temp")
_tarname = "tarfile.tar"
_tarpath = os.path.join("tarfile.tar")
_instruments = ["M1", "M1_expo", "M1_det",
"M2", "M2_expo", "M2_det",
"PN", "PN_expo", "PN_det",
"EP", "EP_expo", "EP_det"]
self._create_tar(tempdir + "/" + _tarname, self._files)
self._create_tar(_tarpath, self._files)
xsa = XMMNewtonClass(self.get_dummy_tap_handler())
res = xsa.get_epic_images(tempdir + "/" + _tarname, band=[], instrument=[],
res = xsa.get_epic_images(_tarpath, band=[], instrument=[],
get_detmask=True, get_exposure_map=True)
assert len(res) == 6 # Number of different bands
assert len(res[1]) == 9 # Number of different inst within band 1
Expand Down Expand Up @@ -477,11 +478,11 @@ def test_get_epic_images(self):

def test_get_epic_lightcurve(self):
tempdir = tempfile.mkdtemp("temp")
_tarname = "tarfile.tar"
self._create_tar(tempdir + "/" + _tarname, self._files)
_tarpath = os.path.join("tarfile.tar")
self._create_tar(_tarpath, self._files)
_source_number = 1
xsa = XMMNewtonClass(self.get_dummy_tap_handler())
res = xsa.get_epic_lightcurve(tempdir + "/" + _tarname, _source_number,
res = xsa.get_epic_lightcurve(_tarpath, _source_number,
instrument=['M1', 'M2', 'PN'])
assert res == {}

Expand All @@ -498,11 +499,11 @@ def test_get_epic_lightcurve_non_existing_file(self, capsys):

def test_get_epic_lightcurve_invalid_instrument(self, capsys):
tempdir = tempfile.mkdtemp("temp")
_tarname = "tarfile.tar"
_tarpath = os.path.join("tarfile.tar")
_invalid_instrument = "II"
self._create_tar(tempdir + "/" + _tarname, self._files)
self._create_tar(_tarpath, self._files)
xsa = XMMNewtonClass(self.get_dummy_tap_handler())
res = xsa.get_epic_images(tempdir + "/" + _tarname, [], [_invalid_instrument],
res = xsa.get_epic_images(_tarpath, [], [_invalid_instrument],
get_detmask=True, get_exposure_map=True)
assert res == {}
out, err = capsys.readouterr()
Expand All @@ -512,12 +513,12 @@ def test_get_epic_lightcurve_invalid_instrument(self, capsys):

def test_get_epic_lightcurve_invalid_source_number(self, capsys):
tempdir = tempfile.mkdtemp("temp")
_tarname = "tarfile.tar"
_tarpath = os.path.join("tarfile.tar")
_invalid_source_number = 833
_default_instrument = ['M1', 'M2', 'PN', 'EP']
self._create_tar(tempdir + "/" + _tarname, self._files)
self._create_tar(_tarpath, self._files)
xsa = XMMNewtonClass(self.get_dummy_tap_handler())
res = xsa.get_epic_lightcurve(tempdir + "/" + _tarname, _invalid_source_number,
res = xsa.get_epic_lightcurve(_tarpath, _invalid_source_number,
instrument=[])
assert res == {}
out, err = capsys.readouterr()
Expand All @@ -526,7 +527,7 @@ def test_get_epic_lightcurve_invalid_source_number(self, capsys):
" Source Number: %u\n"
" Instrument: %s\n"
" [astroquery.esa.xmm_newton.core]\n"
% (tempdir + "/" + _tarname, _invalid_source_number,
% (_tarpath, _invalid_source_number,
_default_instrument))

def test_create_link(self):
Expand Down

0 comments on commit 6fa74ba

Please sign in to comment.