646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
29 lines
610 B
Diff
29 lines
610 B
Diff
diff --git a/tests/fixtures/aws.py b/tests/fixtures/aws.py
|
|
index 7eea4bd..9fb3345 100644
|
|
--- a/tests/fixtures/aws.py
|
|
+++ b/tests/fixtures/aws.py
|
|
@@ -1,15 +1,17 @@
|
|
import boto3
|
|
-from moto import mock_s3
|
|
import pytest
|
|
|
|
+try:
|
|
+ # Moto 4.x
|
|
+ from moto import mock_s3
|
|
+except ImportError:
|
|
+ # Moto 5.x
|
|
+ from moto import mock_aws as mock_s3
|
|
|
|
@pytest.fixture
|
|
def aws_session():
|
|
- mock_s3_server = mock_s3()
|
|
- mock_s3_server.start()
|
|
- yield boto3.Session()
|
|
- mock_s3_server.stop()
|
|
-
|
|
+ with mock_s3():
|
|
+ yield boto3.Session()
|
|
|
|
@pytest.fixture
|
|
def aws_s3_bucket(aws_session):
|