fix: Move port selection into the filelock. (#174)

.github/workflows/build.yml

@@ -41,9 +41,17 @@ jobs:
       python-versions: '["3.7", "3.8", "3.9", "3.10"]'
       lint: false
 
+  test:
+    uses: ./.github/workflows/lint_and_test.yml
+    with:
+      install: make install
+      lint: false
+      sqlalchemy-versions: '["1.4.39"]'
+      python-versions: '["3.10"]'
+
   test-and-lint:
     uses: ./.github/workflows/lint_and_test.yml
     with:
       install: make install
       sqlalchemy-versions: '["1.4.39"]'
-      python-versions: '["3.7", "3.8", "3.9", "3.10"]'
+      python-versions: '["3.7", "3.8", "3.9"]'

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pytest-mock-resources"
-version = "2.6.3"
+version = "2.6.4"
 description = "A pytest plugin for easily instantiating reproducible mock resources."
 authors = [
     "Omar Khan <oakhan3@gmail.com>",
@@ -119,6 +119,7 @@ markers = [
 ]
 filterwarnings = [
   "error",
+  "ignore:There is no current event loop:DeprecationWarning",
 ]
 
 [build-system]

src/pytest_mock_resources/container/base.py

@@ -40,15 +40,6 @@ def get_container(pytestconfig, config, *, retries=DEFAULT_RETRIES, interval=DEF
     # we will need to know whether it's been created already or not.
     container = None
 
-    if config.port is None:
-        config.set("port", unused_tcp_port())
-
-    run_kwargs = dict(
-        publish=[(dest, source) for source, dest in config.ports().items()],
-        envs=config.environment(),
-        name=container_name(config.name, config.port),
-    )
-
     try:
         if multiprocess_safe_mode:
             from filelock import FileLock
@@ -59,9 +50,7 @@ def get_container(pytestconfig, config, *, retries=DEFAULT_RETRIES, interval=DEF
             # wait for the container one process at a time
             with FileLock(str(fn)):
                 container = wait_for_container(
-                    config.check_fn,
-                    run_args=(config.image,),
-                    run_kwargs=run_kwargs,
+                    config,
                     retries=retries,
                     interval=interval,
                 )
@@ -70,9 +59,7 @@ def get_container(pytestconfig, config, *, retries=DEFAULT_RETRIES, interval=DEF
 
         else:
             container = wait_for_container(
-                config.check_fn,
-                run_args=(config.image,),
-                run_kwargs=run_kwargs,
+                config,
                 retries=retries,
                 interval=interval,
             )
@@ -84,16 +71,25 @@ def get_container(pytestconfig, config, *, retries=DEFAULT_RETRIES, interval=DEF
             container.kill()
 
 
-def wait_for_container(
-    check_fn, *, run_args, run_kwargs, retries=DEFAULT_RETRIES, interval=DEFAULT_INTERVAL
-):
+def wait_for_container(config, *, retries=DEFAULT_RETRIES, interval=DEFAULT_INTERVAL):
     """Wait for evidence that the container is up and healthy.
 
     The caller must provide a `check_fn` which should `raise ContainerCheckFailed` if
     it finds that the container is not yet up.
     """
     from python_on_whales import docker
 
+    if config.port is None:
+        config.set("port", unused_tcp_port())
+
+    check_fn = config.check_fn
+    run_args = (config.image,)
+    run_kwargs = dict(
+        publish=[(dest, source) for source, dest in config.ports().items()],
+        envs=config.environment(),
+        name=container_name(config.name, config.port),
+    )
+
     try:
         from python_on_whales.exceptions import DockerException
     except ImportError:  # pragma: no cover