Skip to content

Commit 30f06a4

Browse files
committed
Make test_tap_url() consistent
1 parent 0bfc7af commit 30f06a4

File tree

1 file changed

+5
-16
lines changed

1 file changed

+5
-16
lines changed

astroquery/eso/tests/test_eso.py

+5-16
Original file line numberDiff line numberDiff line change
@@ -230,38 +230,27 @@ def test_calselector_multipart(monkeypatch, tmp_path):
230230

231231

232232
def test_tap_url():
233-
tap_url_env_var = "TAP_URL"
233+
tap_url_env_var = "ESO_TAP_URL"
234234
tmpvar = None
235235
dev_url = "dev_url"
236236
prod_url = "https://archive.eso.org/tap_obs"
237237

238+
# ESO_TAP_URL shouldn't be set to start the test
238239
try:
239-
# this shouldn't be set at this point
240240
tmpvar = os.environ[tap_url_env_var]
241241
del os.environ[tap_url_env_var]
242242
except KeyError:
243243
pass
244244

245245
eso_instance = Eso()
246246

247-
# TAP URL not set and DEV False
248-
eso_instance.USE_DEV_TAP = False
247+
# ESO_TAP_URL not set
249248
assert eso_instance.tap_url() == prod_url
250249

251-
# TAP URL not set and DEV True
252-
eso_instance.USE_DEV_TAP = True
253-
with pytest.raises(KeyError):
254-
_ = eso_instance.tap_url()
255-
256-
os.environ["TAP_URL"] = dev_url
257-
# TAP URL set and DEV True
258-
eso_instance.USE_DEV_TAP = True
250+
# ESO_TAP_URL set
251+
os.environ[tap_url_env_var] = dev_url
259252
assert eso_instance.tap_url() == dev_url
260253

261-
# TAP URL set and DEV False
262-
eso_instance.USE_DEV_TAP = False
263-
assert eso_instance.tap_url() == prod_url
264-
265254
# set again the env vars, in case we deleted it earlier
266255
if tmpvar:
267256
os.environ[tap_url_env_var] = tmpvar

0 commit comments

Comments
 (0)