From d4450d9ee31d21a7ab0bbb7176e7b065515bd7c2 Mon Sep 17 00:00:00 2001
From: Gyeongjae Choi <def6488@gmail.com>
Date: Mon, 29 Jan 2024 02:04:40 +0900
Subject: [PATCH] Pin pytest < 8.0 and make s3 test compatible to moto 5.0
 update (#4437)

pytest 8.0 and moto 5.0 were released a few hours ago, and
they seem to be breaking tests. This is a (temporary) fix.
---
 pyodide-build/pyproject.toml  | 3 ++-
 requirements.txt              | 3 ++-
 tools/tests/test_deploy_s3.py | 8 ++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pyodide-build/pyproject.toml b/pyodide-build/pyproject.toml
index 2042c2edd..df89ec3ab 100644
--- a/pyodide-build/pyproject.toml
+++ b/pyodide-build/pyproject.toml
@@ -58,7 +58,8 @@ xbuildenv = "pyodide_build.cli.xbuildenv:app"
 
 [project.optional-dependencies]
 test = [
-    "pytest",
+    # (FIXME: 2024/01/28) The latest pytest-asyncio 0.23.3 is not compatible with pytest 8.0.0
+    "pytest<8.0.0",
     "pytest-pyodide==0.56.2",
 ]
 deploy = [
diff --git a/requirements.txt b/requirements.txt
index c89c07efc..fa9cd617f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,8 @@ pre-commit
 build==1.0.3
 sphinx-click
 hypothesis
-pytest
+# (FIXME: 2024/01/28) The latest pytest-asyncio 0.23.3 is not compatible with pytest 8.0.0
+pytest<8.0.0
 pytest-asyncio
 pytest-cov
 pytest-httpserver
diff --git a/tools/tests/test_deploy_s3.py b/tools/tests/test_deploy_s3.py
index 9e40ac38a..2f22a3922 100644
--- a/tools/tests/test_deploy_s3.py
+++ b/tools/tests/test_deploy_s3.py
@@ -7,13 +7,13 @@ from pathlib import Path, PurePosixPath
 
 import boto3
 import pytest
-from moto import mock_s3
+from moto import mock_aws
 
 sys.path.append(str(Path(__file__).parents[1]))
 from deploy_s3 import check_s3_object_exists, deploy_to_s3_main
 
 
-@mock_s3
+@mock_aws
 def test_check_s3_object_exists():
     bucket_name = "mybucket"
     s3_client = boto3.client("s3", region_name="us-east-1")
@@ -25,7 +25,7 @@ def test_check_s3_object_exists():
     assert check_s3_object_exists(s3_client, bucket_name, "/a/test2.txt") is False
 
 
-@mock_s3
+@mock_aws
 def test_deploy_to_s3_overwrite(tmp_path, capsys):
     (tmp_path / "a.whl").write_text("a")
     (tmp_path / "b.tar").write_text("b")
@@ -102,7 +102,7 @@ def test_deploy_to_s3_overwrite(tmp_path, capsys):
     assert get_object_list() == {"dev/full/c.zip", "dev/full/a.whl"}
 
 
-@mock_s3
+@mock_aws
 def test_deploy_to_s3_mime_type(tmp_path, capsys):
     """Test that we set the correct MIME type for each file extension"""
     for ext in [