Use closest run-specifying marker, else config

Author: altendky

pytest_trio/_tests/test_trio_mode.py

@@ -138,3 +138,46 @@ async def test():
             f"*ValueError: {run_name!r} not valid for 'trio_run' config.  Must be one of: *"
         ]
     )
+
+
+def test_closest_explicit_run_wins(testdir):
+    testdir.makefile(
+        ".ini", pytest=f"[pytest]\ntrio_mode = true\ntrio_run = trio\n"
+    )
+    testdir.makepyfile(qtrio=qtrio_text)
+
+    test_text = """
+    import pytest
+    import pytest_trio
+    import qtrio
+
+    @pytest.mark.trio(run='should be ignored')
+    @pytest.mark.trio(run=qtrio.run)
+    async def test():
+        assert qtrio.fake_used
+    """
+    testdir.makepyfile(test_text)
+
+    result = testdir.runpytest()
+    result.assert_outcomes(passed=1)
+
+
+def test_ini_run_wins_with_blank_marker(testdir):
+    testdir.makefile(
+        ".ini", pytest=f"[pytest]\ntrio_mode = true\ntrio_run = qtrio\n"
+    )
+    testdir.makepyfile(qtrio=qtrio_text)
+
+    test_text = """
+    import pytest
+    import pytest_trio
+    import qtrio
+
+    @pytest.mark.trio
+    async def test():
+        assert qtrio.fake_used
+    """
+    testdir.makepyfile(test_text)
+
+    result = testdir.runpytest()
+    result.assert_outcomes(passed=1)

pytest_trio/plugin.py

@@ -353,9 +353,15 @@ def _trio_test_runner_factory(item, testfunc=None):
     else:
         testfunc = item.obj
 
-        config_run = choose_run(config=item.config)
-        marker = item.get_closest_marker("trio")
-        run = marker.kwargs.get('run', config_run)
+        for marker in item.iter_markers("trio"):
+            maybe_run = marker.kwargs.get('run')
+            if maybe_run is not None:
+                run = maybe_run
+                break
+        else:
+            # no marker found that explicitly specifiers the runner so use config
+            run = choose_run(config=item.config)
+
 
     if getattr(testfunc, '_trio_test_runner_wrapped', False):
         # We have already wrapped this, perhaps because we combined Hypothesis