diff --git a/tests/test_settings.py b/tests/test_settings.py index a7bd86c3..06fd4144 100644 --- a/tests/test_settings.py +++ b/tests/test_settings.py @@ -2274,7 +2274,10 @@ def test_protected_namespace_defaults(): # pydantic default with pytest.warns( UserWarning, - match='Field "model_dump_prefixed_field" in Model has conflict with protected namespace "model_dump"', + match=( + 'Field "model_dump_prefixed_field" in Model has conflict with protected namespace "model_dump"|' + r"Field 'model_dump_prefixed_field' in 'Model' conflicts with protected namespace 'model_dump'\..*" + ), ): class Model(BaseSettings): @@ -2283,18 +2286,21 @@ class Model(BaseSettings): # pydantic-settings default with pytest.warns( UserWarning, - match='Field "settings_customise_sources_prefixed_field" in Model1 has conflict with protected namespace "settings_customise_sources"', + match=( + 'Field "settings_customise_sources_prefixed_field" in Model1 has conflict with protected namespace "settings_customise_sources"|' + r"Field 'settings_customise_sources_prefixed_field' in 'Model1' conflicts with protected namespace 'settings_customise_sources'\..*" + ), ): class Model1(BaseSettings): settings_customise_sources_prefixed_field: str with pytest.raises( - NameError, + (NameError, ValueError), match=( - 'Field "settings_customise_sources" conflicts with member > " - 'of protected namespace "settings_customise_sources".' + r'Field (["\'])settings_customise_sources\1 conflicts with member > " + r'of protected namespace \1settings_customise_sources\1\.' ), ):