Skip to content

Commit aa5811c

Browse files
authored
AAP-47050 Fix unit tests (#737)
Also remove testing requirements from requirements_all.txt
1 parent ad4f69b commit aa5811c

File tree

4 files changed

+3
-16
lines changed

4 files changed

+3
-16
lines changed

ansible_base/lib/testing/util.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def copy_fixture(copies=1):
1414
"""
1515

1616
def wrapper(func):
17-
if '_fixture_function' not in dir(func):
17+
if '_fixture_function' not in dir(func) and '_pytestfixturefunction' not in dir(func):
1818
raise TypeError(f"Can't apply copy_fixture to {func.__name__} because it is not a fixture. HINT: @copy_fixture must be *above* @pytest.fixture")
1919

2020
module_name = func.__module__

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ optional-dependencies.all = { file = [
4141
"requirements/requirements_rest_filters.in",
4242
"requirements/requirements_channels.in",
4343
"requirements/requirements_jwt_consumer.in",
44-
"requirements/requirements_testing.in",
44+
"requirements/requirements_testing.txt",
4545
"requirements/requirements_redis_client.in",
4646
"requirements/requirements_oauth2_provider.in",
4747
"requirements/requirements_resource_registry.in",
@@ -54,7 +54,7 @@ optional-dependencies.rest_filters = { file = [ "requirements/requirements_rest_
5454
optional-dependencies.rbac = { file = [ "requirements/requirements_rbac.in" ] }
5555
optional-dependencies.channel_auth = { file = [ "requirements/requirements_channels.in" ] }
5656
optional-dependencies.jwt_consumer = { file = [ "requirements/requirements_jwt_consumer.in" ] }
57-
optional-dependencies.testing = { file = [ "requirements/requirements_testing.in" ] }
57+
optional-dependencies.testing = { file = [ "requirements/requirements_testing.txt" ] }
5858
optional-dependencies.redis_client = { file = [ "requirements/requirements_redis_client.in" ] }
5959
optional-dependencies.oauth2_provider = { file = [ "requirements/requirements_oauth2_provider.in" ] }
6060
optional-dependencies.resource_registry = { file = [ "requirements/requirements_resource_registry.in" ] }

requirements/requirements_all.txt

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ charset-normalizer==3.4.0
1818
cryptography==44.0.0
1919
# via
2020
# -r requirements/requirements.in
21-
# -r requirements/requirements_testing.in
2221
# jwcrypto
2322
# social-auth-core
2423
defusedxml==0.8.0rc2
@@ -61,8 +60,6 @@ inflection==0.5.1
6160
# via
6261
# -r requirements/requirements.in
6362
# drf-spectacular
64-
iniconfig==2.0.0
65-
# via pytest
6663
isodate==0.7.2
6764
# via python3-saml
6865
jsonschema==4.23.0
@@ -84,10 +81,6 @@ oauthlib==3.2.2
8481
# django-oauth-toolkit
8582
# requests-oauthlib
8683
# social-auth-core
87-
packaging==24.2
88-
# via pytest
89-
pluggy==1.5.0
90-
# via pytest
9184
pyasn1==0.6.1
9285
# via
9386
# pyasn1-modules
@@ -103,12 +96,6 @@ pyjwt==2.10.1
10396
# social-auth-core
10497
pyrad==2.4
10598
# via -r requirements/requirements_authentication.in
106-
pytest==8.3.4
107-
# via
108-
# -r requirements/requirements_testing.in
109-
# pytest-django
110-
pytest-django==4.9.0
111-
# via -r requirements/requirements_testing.in
11299
python-ldap==3.4.4
113100
# via
114101
# -r requirements/requirements_authentication.in
File renamed without changes.

0 commit comments

Comments
 (0)