corrections to check for multiple warnings

spacetelescope · Jun 3, 2024 · fc28c86 · fc28c86
1 parent 77df5ff
commit fc28c86
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/jdaviz/tests/test_utils.py b/jdaviz/tests/test_utils.py
@@ -41,10 +41,10 @@ def test_url_to_download_imviz_local_path_warning(imviz_helper):
         'MAST URIs.*astropy download cache instead.*'
     )
     with (
-        pytest.warns(UserWarning, match=match_local_path_msg),
-        pytest.warns(FITSFixedWarning, match="'datfix' made the change")
+        pytest.warns(FITSFixedWarning, match="'datfix' made the change"),
+        pytest.warns(UserWarning, match=match_local_path_msg)
     ):
-        imviz_helper.load_data(url, cache=False, local_path='horsehead.fits')
+        imviz_helper.load_data(url, cache=True, local_path='horsehead.fits')
 
 
 @pytest.mark.remote_data

diff --git a/jdaviz/utils.py b/jdaviz/utils.py
@@ -479,10 +479,7 @@ def download_uri_to_path(possible_uri, cache=None, local_path=os.curdir, timeout
             # if you give a directory, save the file there with default name:
             local_path = os.path.join(local_path, parsed_uri.path.split(os.path.sep)[-1])
 
-        if timeout is None:
-            timeout = conf.timeout.defaultvalue
-
-        with conf.timeout.set_temp(timeout):
+        with conf.set_temp('timeout', timeout):
             (status, msg, url) = Observations.download_file(
                 possible_uri, cache=cache, local_path=local_path
             )