Merge remote-tracking branch 'upstream/main' into drop-nulls-false-de…

…fault
cytomining · Jul 28, 2023 · bb20837 · bb20837
2 parents 3738237 + 4ffbe9f
commit bb20837
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/tests/test_convert.py b/tests/test_convert.py
@@ -6,6 +6,8 @@
 
 import itertools
 import pathlib
+import shutil
+import tempfile
 from shutil import copy
 from typing import Any, Dict, List, Tuple, cast
 
@@ -546,20 +548,24 @@ def test_convert_s3_path_csv(
 
 
 def test_convert_s3_path_sqlite(
-    get_tempdir: str,
     data_dir_cellprofiler_sqlite_nf1: str,
     example_s3_endpoint: str,
 ):
     """
     Tests convert with mocked sqlite s3 object storage endpoint
+
+    Note: we use a dedicated tmpdir for work in this test to avoid
+    race conditions with nested pytest fixture post-yield deletions.
     """
 
+    tmpdir = tempfile.mkdtemp()
+
     # local sqlite read
     local_cytotable_table = parquet.read_table(
         source=convert(
             source_path=data_dir_cellprofiler_sqlite_nf1,
             dest_path=(
-                f"{get_tempdir}/{pathlib.Path(data_dir_cellprofiler_sqlite_nf1).name}"
+                f"{tmpdir}/{pathlib.Path(data_dir_cellprofiler_sqlite_nf1).name}"
                 ".cytotable.parquet"
             ),
             dest_datatype="parquet",
@@ -573,7 +579,7 @@ def test_convert_s3_path_sqlite(
         source=convert(
             source_path=f"s3://example/nf1/{pathlib.Path(data_dir_cellprofiler_sqlite_nf1).name}",
             dest_path=(
-                f"{get_tempdir}/{pathlib.Path(data_dir_cellprofiler_sqlite_nf1).name}"
+                f"{tmpdir}/{pathlib.Path(data_dir_cellprofiler_sqlite_nf1).name}"
                 ".cytotable.parquet"
             ),
             dest_datatype="parquet",
@@ -588,7 +594,7 @@ def test_convert_s3_path_sqlite(
         source=convert(
             source_path="s3://example/nf1/",
             dest_path=(
-                f"{get_tempdir}/{pathlib.Path(data_dir_cellprofiler_sqlite_nf1).name}"
+                f"{tmpdir}/{pathlib.Path(data_dir_cellprofiler_sqlite_nf1).name}"
                 ".cytotable.parquet"
             ),
             dest_datatype="parquet",
@@ -613,6 +619,8 @@ def test_convert_s3_path_sqlite(
         )
     )
 
+    shutil.rmtree(path=tmpdir, ignore_errors=True)
+
 
 def test_infer_source_group_common_schema(
     example_local_sources: Dict[str, List[Dict[str, Any]]],