Clean up paths in alma tests

Author: jdavies-st

astroquery/alma/tests/test_alma_remote.py

@@ -1,17 +1,15 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
-import tempfile
-import shutil
-import numpy as np
-import pytest
-
 from datetime import datetime
 import os
+from pathlib import Path
 from urllib.parse import urlparse
 import re
 from unittest.mock import Mock, MagicMock, patch
 
 from astropy import coordinates
 from astropy import units as u
+import numpy as np
+import pytest
 
 from astroquery.exceptions import CorruptDataWarning
 from astroquery.utils.commons import ASTROPY_LT_4_1
@@ -181,7 +179,7 @@ def test_data_info(self, tmp_path, alma):
                 break
         assert file_url
         alma.download_files([file_url], savedir=tmp_path)
-        assert os.stat(os.path.join(tmp_path, file)).st_size
+        assert Path(tmp_path, file).stat().st_size
 
         # mock downloading an entire program
         download_files_mock = Mock()
@@ -252,7 +250,7 @@ def test_download_and_extract(self, tmp_path, alma):
                     [asdm_url], include_asdm=True, regex=r'.*\.py')
         delete_mock.assert_called_once_with(
             'cache_path/' + asdm_url.split('/')[-1])
-        assert downloaded_asdm == [os.path.join(tmp_path, 'foo.py')]
+        assert downloaded_asdm == [Path(tmp_path, 'foo.py')]
 
     def test_doc_example(self, tmp_path, alma):
         alma.cache_location = tmp_path
@@ -536,44 +534,34 @@ def test_big_download_regression(alma):
 
 
 @pytest.mark.remote_data
-def test_download_html_file(alma):
+def test_download_html_file(alma, tmp_path):
+    alma.cache_location = tmp_path
     result = alma.download_files(['https://{}/dataPortal/member.uid___A001_X1284_X1353.qa2_report.html'.format(download_hostname)])
     assert result
 
 
 @pytest.mark.remote_data
-def test_verify_html_file(alma, caplog):
-    # first, make sure the file is not cached (in case this test gets called repeatedly)
-    # (we are hacking the file later in this test to trigger different failure modes so
-    # we need it fresh)
-    try:
-        result = alma.download_files(['https://{}/dataPortal/member.uid___A001_X1284_X1353.qa2_report.html'.format(download_hostname)], verify_only=True)
-        local_filepath = result[0]
-        os.remove(local_filepath)
-    except FileNotFoundError:
-        pass
-
-    caplog.clear()
+def test_verify_html_file(alma, caplog, tmp_path):
+    alma.cache_location = tmp_path
 
     # download the file
     result = alma.download_files(['https://{}/dataPortal/member.uid___A001_X1284_X1353.qa2_report.html'.format(download_hostname)])
     assert 'member.uid___A001_X1284_X1353.qa2_report.html' in result[0]
 
     result = alma.download_files(['https://{}/dataPortal/member.uid___A001_X1284_X1353.qa2_report.html'.format(download_hostname)], verify_only=True)
     assert 'member.uid___A001_X1284_X1353.qa2_report.html' in result[0]
-    local_filepath = result[0]
-    existing_file_length = 66336
-    assert f"Found cached file {local_filepath} with expected size {existing_file_length}." in caplog.text
+    local_filepath = Path(result[0])
+    expected_file_length = local_filepath.stat().st_size
+    assert f"Found cached file {local_filepath} with expected size {expected_file_length}." in caplog.text
 
     # manipulate the file
     with open(local_filepath, 'ab') as fh:
         fh.write(b"Extra Text")
 
     caplog.clear()
-    length = 66336
-    existing_file_length = length + 10
+    new_file_length = expected_file_length + 10
     with pytest.warns(expected_warning=CorruptDataWarning,
-            match=f"Found cached file {local_filepath} with size {existing_file_length} > expected size {length}.  The download is likely corrupted."):
+                      match=f"Found cached file {local_filepath} with size {new_file_length} > expected size {expected_file_length}.  The download is likely corrupted."):
         result = alma.download_files(['https://{}/dataPortal/member.uid___A001_X1284_X1353.qa2_report.html'.format(download_hostname)], verify_only=True)
     assert 'member.uid___A001_X1284_X1353.qa2_report.html' in result[0]
 
@@ -584,10 +572,5 @@ def test_verify_html_file(alma, caplog):
     caplog.clear()
     result = alma.download_files(['https://{}/dataPortal/member.uid___A001_X1284_X1353.qa2_report.html'.format(download_hostname)], verify_only=True)
     assert 'member.uid___A001_X1284_X1353.qa2_report.html' in result[0]
-    length = 66336
     existing_file_length = 10
-    assert f"Found cached file {local_filepath} with size {existing_file_length} < expected size {length}.  The download should be continued." in caplog.text
-
-    # cleanup: we don't want `test_download_html_file` to fail if this test is re-run
-    if os.path.exists(local_filepath):
-        os.remove(local_filepath)
+    assert f"Found cached file {local_filepath} with size {existing_file_length} < expected size {expected_file_length}.  The download should be continued." in caplog.text