Fix test issues on Windows (#601)

* Fix test issues on Windows

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: ponyisi

tests/test_minio_adapter.py

@@ -32,19 +32,23 @@
 
 from servicex.minio_adapter import MinioAdapter
 from servicex.models import ResultFile
+from pathlib import Path
 
 DOWNLOAD_PATCH_COUNTER = 0
 
 
-def mock_downloader(**args):
-    global DOWNLOAD_PATCH_COUNTER
-    DOWNLOAD_PATCH_COUNTER += 1
-    if DOWNLOAD_PATCH_COUNTER == 1:
-        raise Exception("lol")
-    elif DOWNLOAD_PATCH_COUNTER == 2:
-        open("/tmp/foo/test.txt", "wb").write(b"\x01" * 5)
-    elif DOWNLOAD_PATCH_COUNTER == 3:
-        open("/tmp/foo/test.txt", "wb").write(b"\x01" * 10)
+def make_mock_downloader(target: Path):
+    def mock_downloader(**args):
+        global DOWNLOAD_PATCH_COUNTER
+        DOWNLOAD_PATCH_COUNTER += 1
+        if DOWNLOAD_PATCH_COUNTER == 1:
+            raise Exception("lol")
+        elif DOWNLOAD_PATCH_COUNTER == 2:
+            open(target, "wb").write(b"\x01" * 5)
+        elif DOWNLOAD_PATCH_COUNTER == 3:
+            open(target, "wb").write(b"\x01" * 10)
+
+    return mock_downloader
 
 
 @fixture
@@ -65,7 +69,6 @@ async def populate_bucket(request, minio_adapter):
             Bucket=minio_adapter.bucket, Key=request.param, Body=b"\x01" * 10
         )
         yield
-        await s3.delete_object(Bucket=minio_adapter.bucket, Key=request.param)
 
 
 @fixture
@@ -95,8 +98,8 @@ async def test_list_bucket(minio_adapter, populate_bucket):
 
 @pytest.mark.parametrize("populate_bucket", ["test.txt"], indirect=True)
 @pytest.mark.asyncio
-async def test_download_file(minio_adapter, populate_bucket):
-    result = await minio_adapter.download_file("test.txt", local_dir="/tmp/foo")
+async def test_download_file(minio_adapter, populate_bucket, tmp_path):
+    result = await minio_adapter.download_file("test.txt", local_dir=tmp_path)
     assert str(result).endswith("test.txt")
     assert result.exists()
     assert result.read_bytes() == (b"\x01" * 10)
@@ -105,10 +108,12 @@ async def test_download_file(minio_adapter, populate_bucket):
 
 @pytest.mark.parametrize("populate_bucket", ["test.txt"], indirect=True)
 @pytest.mark.asyncio
-async def test_download_file_with_expected_size(minio_adapter, populate_bucket):
+async def test_download_file_with_expected_size(
+    minio_adapter, populate_bucket, tmp_path
+):
     info = await minio_adapter.list_bucket()
     result = await minio_adapter.download_file(
-        "test.txt", local_dir="/tmp/foo", expected_size=info[0].size
+        "test.txt", local_dir=tmp_path, expected_size=info[0].size
     )
     assert str(result).endswith("test.txt")
     assert result.exists()
@@ -118,8 +123,8 @@ async def test_download_file_with_expected_size(minio_adapter, populate_bucket):
 
 @pytest.mark.parametrize("populate_bucket", ["t::est.txt"], indirect=True)
 @pytest.mark.asyncio
-async def test_download_bad_filename(minio_adapter, populate_bucket):
-    result = await minio_adapter.download_file("t::est.txt", local_dir="/tmp/foo")
+async def test_download_bad_filename(minio_adapter, populate_bucket, tmp_path):
+    result = await minio_adapter.download_file("t::est.txt", local_dir=tmp_path)
     assert str(result).endswith("t__est.txt")
     assert result.exists()
     assert result.read_bytes() == (b"\x01" * 10)
@@ -128,9 +133,11 @@ async def test_download_bad_filename(minio_adapter, populate_bucket):
 
 @pytest.mark.parametrize("populate_bucket", ["test.txt"], indirect=True)
 @pytest.mark.asyncio
-async def test_download_short_filename_no_change(minio_adapter, populate_bucket):
+async def test_download_short_filename_no_change(
+    minio_adapter, populate_bucket, tmp_path
+):
     result = await minio_adapter.download_file(
-        "test.txt", local_dir="/tmp/foo", shorten_filename=True
+        "test.txt", local_dir=tmp_path, shorten_filename=True
     )
     assert str(result).endswith("test.txt")
     assert result.exists()
@@ -146,10 +153,10 @@ async def test_download_short_filename_no_change(minio_adapter, populate_bucket)
     indirect=True,
 )
 @pytest.mark.asyncio
-async def test_download_short_filename_change(minio_adapter, populate_bucket):
+async def test_download_short_filename_change(minio_adapter, populate_bucket, tmp_path):
     result = await minio_adapter.download_file(
         "test12345678901234567890123456789012345678901234567898012345678901234567890.txt",
-        local_dir="/tmp/foo",
+        local_dir=tmp_path,
         shorten_filename=True,
     )
 
@@ -164,19 +171,18 @@ async def test_download_short_filename_change(minio_adapter, populate_bucket):
     result.unlink()  # it should exist, from above ...
 
 
-@pytest.mark.parametrize("populate_bucket", ["test2.txt"], indirect=True)
+@pytest.mark.parametrize("populate_bucket", ["test.txt"], indirect=True)
 @pytest.mark.asyncio
-async def test_download_repeat(minio_adapter, populate_bucket):
+async def test_download_repeat(minio_adapter, populate_bucket, tmp_path):
     import asyncio
 
-    print(await minio_adapter.list_bucket())
-    result = await minio_adapter.download_file("test2.txt", local_dir="/tmp/foo")
-    assert str(result).endswith("test2.txt")
+    result = await minio_adapter.download_file("test.txt", local_dir=tmp_path)
+    assert str(result).endswith("test.txt")
     assert result.exists()
     t0 = result.stat().st_mtime_ns
     await asyncio.sleep(4)  # hopefully long enough for Windows/FAT32 ... ?
 
-    result2 = await minio_adapter.download_file("test2.txt", local_dir="/tmp/foo")
+    result2 = await minio_adapter.download_file("test.txt", local_dir=tmp_path)
     assert result2.exists()
     assert result2 == result
     assert t0 == result2.stat().st_mtime_ns
@@ -192,11 +198,12 @@ async def test_get_signed_url(minio_adapter, moto_services, populate_bucket):
 
 @pytest.mark.parametrize("populate_bucket", ["test.txt"], indirect=True)
 @pytest.mark.asyncio
-async def test_download_file_retry(minio_adapter, populate_bucket, mocker):
+async def test_download_file_retry(minio_adapter, populate_bucket, mocker, tmp_path):
     download_patch = mocker.patch(
-        "aioboto3.s3.inject.download_file", side_effect=mock_downloader
+        "aioboto3.s3.inject.download_file",
+        side_effect=make_mock_downloader(tmp_path / "test.txt"),
     )
-    result = await minio_adapter.download_file("test.txt", local_dir="/tmp/foo")
+    result = await minio_adapter.download_file("test.txt", local_dir=tmp_path)
     assert str(result).endswith("test.txt")
     assert result.exists()
     assert download_patch.call_count == 3

tests/test_servicex_adapter.py

@@ -94,10 +94,15 @@ async def test_get_transforms_auth_error(mock_get, servicex):
 
 
 @pytest.mark.asyncio
+@patch("servicex.servicex_adapter.RetryClient.post")
 @patch("servicex.servicex_adapter.jwt.decode")
 async def test_get_transforms_wlcg_bearer_token(
-    decode, servicex, transform_status_response
+    decode, post, servicex, transform_status_response
 ):
+    post.return_value.__aenter__.return_value.json.return_value = {
+        "access_token": "luckycharms"
+    }
+    post.return_value.__aenter__.return_value.status = 401
     token_file = tempfile.NamedTemporaryFile(mode="w+t", delete=False)
     token_file.write(
         """"