@@ -230,38 +230,27 @@ def test_calselector_multipart(monkeypatch, tmp_path):
230
230
231
231
232
232
def test_tap_url ():
233
- tap_url_env_var = "TAP_URL "
233
+ tap_url_env_var = "ESO_TAP_URL "
234
234
tmpvar = None
235
235
dev_url = "dev_url"
236
236
prod_url = "https://archive.eso.org/tap_obs"
237
237
238
+ # ESO_TAP_URL shouldn't be set to start the test
238
239
try :
239
- # this shouldn't be set at this point
240
240
tmpvar = os .environ [tap_url_env_var ]
241
241
del os .environ [tap_url_env_var ]
242
242
except KeyError :
243
243
pass
244
244
245
245
eso_instance = Eso ()
246
246
247
- # TAP URL not set and DEV False
248
- eso_instance .USE_DEV_TAP = False
247
+ # ESO_TAP_URL not set
249
248
assert eso_instance .tap_url () == prod_url
250
249
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
259
252
assert eso_instance .tap_url () == dev_url
260
253
261
- # TAP URL set and DEV False
262
- eso_instance .USE_DEV_TAP = False
263
- assert eso_instance .tap_url () == prod_url
264
-
265
254
# set again the env vars, in case we deleted it earlier
266
255
if tmpvar :
267
256
os .environ [tap_url_env_var ] = tmpvar
0 commit comments