fix CI failures.

schireson · Mar 7, 2024 · f4aa625 · f4aa625
1 parent 48c03c2
commit f4aa625
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/src/pytest_mock_resources/compat/__init__.py b/src/pytest_mock_resources/compat/__init__.py
@@ -1,3 +1,6 @@
+import importlib.resources
+import sys
+
 from pytest_mock_resources.compat.import_ import ImportAdaptor
 
 # isort: split
@@ -70,6 +73,13 @@
     pymysql = ImportAdaptor("pymysql", "mysql")
 
 
+def get_resource(package: str) -> str:
+    if sys.version_info >= (3, 9):
+        return str(importlib.resources.files(package))
+
+    return str(importlib.resources.path(package, "").__enter__())
+
+
 __all__ = [
     "sqlalchemy",
     "psycopg2",

diff --git a/src/pytest_mock_resources/container/base.py b/src/pytest_mock_resources/container/base.py
@@ -26,7 +26,7 @@
     from python_on_whales.docker_client import DockerClient
 
 
-DEFAULT_RETRIES = 40
+DEFAULT_RETRIES = 60
 DEFAULT_INTERVAL = 0.5
 
 

diff --git a/src/pytest_mock_resources/fixture/postgresql.py b/src/pytest_mock_resources/fixture/postgresql.py
@@ -1,4 +1,3 @@
-import importlib.resources
 import inspect
 import logging
 from typing import cast
@@ -8,6 +7,7 @@
 from sqlalchemy import text
 from sqlalchemy.engine import Connection, Engine
 
+from pytest_mock_resources.compat import get_resource
 from pytest_mock_resources.container.base import (
     async_retry,
     DEFAULT_RETRIES,
@@ -480,13 +480,10 @@ def _sync_drop_database(conn: Connection, database_name: str):
 
 
 def find_caller_globals():
-    ignore_paths = (
-        str(importlib.resources.files("pytest_mock_resources")),
-        str(importlib.resources.files("pdb")),
-    )
+    ignore_path = get_resource("pytest_mock_resources")
     stack = inspect.stack()
     for item in stack:
-        if item.filename.startswith(ignore_paths):
+        if item.filename.startswith(ignore_path) or item.filename.endswith("pdb.py"):
             continue
 
         frame = item.frame