fix(merge): resolve tests/test_auth.py conflict keeping all tests from both branches

Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-03-08 11:11:21 +00:00
parent 7db26f4a31
commit c31b72810e
24 changed files with 455 additions and 98 deletions
+7
View File
@@ -620,6 +620,13 @@ def _set_minimal_provider_settings(mock_settings):
"email_password": None,
"email_use_tls": True,
"email_sender": None,
"dest_email_host": None,
"dest_email_default_recipient": None,
"dest_email_port": 587,
"dest_email_username": None,
"dest_email_password": None,
"dest_email_use_tls": True,
"dest_email_sender": None,
"ftp_host": None,
"ftp_username": None,
"ftp_password": None,