Skip to content

Commit 779c4a9

Browse files
committed
django_mail_patch_dns: check _django_settings_is_configured:
1 parent 948fd53 commit 779c4a9

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

pytest_django/plugin.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -552,10 +552,12 @@ def mailoutbox(django_mail_patch_dns, _dj_autoclear_mailbox,
552552

553553

554554
@pytest.fixture(scope="function")
555-
def django_mail_patch_dns(monkeypatch, django_mail_dnsname):
556-
from django.core import mail
555+
def django_mail_patch_dns(monkeypatch, django_mail_dnsname,
556+
_django_settings_is_configured):
557+
if _django_settings_is_configured:
558+
from django.core import mail
557559

558-
monkeypatch.setattr(mail.message, "DNS_NAME", django_mail_dnsname)
560+
monkeypatch.setattr(mail.message, "DNS_NAME", django_mail_dnsname)
559561

560562

561563
@pytest.fixture(scope="function")

0 commit comments

Comments
 (0)