From 3be6f280f7828fe64ce0ae0942601307a81883eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A9n=C3=A9dikt=20Tran?= <10796600+picnixz@users.noreply.github.com> Date: Sat, 16 Mar 2024 10:46:21 +0100 Subject: [PATCH 1/2] add the *srcdir* keyword argument in the marker signature --- sphinx/testing/fixtures.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sphinx/testing/fixtures.py b/sphinx/testing/fixtures.py index 2f85ccb0a38..67340f5adcd 100644 --- a/sphinx/testing/fixtures.py +++ b/sphinx/testing/fixtures.py @@ -21,8 +21,9 @@ DEFAULT_ENABLED_MARKERS = [ ( 'sphinx(' - 'buildername="html", /, *, ' - 'testroot="root", confoverrides=None, freshenv=False, ' + 'buildername="html", *, ' + 'testroot="root", srcdir=None, ' + 'confoverrides=None, freshenv=False, ' 'warningiserror=False, tags=None, verbosity=0, parallel=0, ' 'keep_going=False, builddir=None, docutils_conf=None' '): arguments to initialize the sphinx test application.' From fb15b19d5a136fb6b2790508e720cabf8712f965 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A9n=C3=A9dikt=20Tran?= <10796600+picnixz@users.noreply.github.com> Date: Sat, 16 Mar 2024 10:50:14 +0100 Subject: [PATCH 2/2] add the *srcdir* keyword argument in the marker signature --- sphinx/testing/fixtures.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sphinx/testing/fixtures.py b/sphinx/testing/fixtures.py index 67340f5adcd..b48221fc217 100644 --- a/sphinx/testing/fixtures.py +++ b/sphinx/testing/fixtures.py @@ -19,6 +19,9 @@ from typing import Any DEFAULT_ENABLED_MARKERS = [ + # The marker signature differs from the constructor signature + # since the way it is processed assumes keyword arguments for + # the 'testroot' and 'srcdir'. ( 'sphinx(' 'buildername="html", *, '