Look for django.conf in django_settings_is_configured

Author: blueyed

pytest_django/lazy_django.py

@@ -17,7 +17,7 @@ def skip_if_no_django():
 def django_settings_is_configured():
     # Avoid importing Django if it has not yet been imported
     if not os.environ.get('DJANGO_SETTINGS_MODULE') \
-            and 'django' not in sys.modules:
+            and 'django.conf' not in sys.modules:
         return False
 
     # If DJANGO_SETTINGS_MODULE is defined at this point, Django is assumed to

tests/test_django_settings_module.py

@@ -6,8 +6,6 @@
 import django
 import pytest
 
-from pytest_django.lazy_django import django_settings_is_configured
-
 
 BARE_SETTINGS = '''
 # At least one database must be configured
@@ -267,17 +265,21 @@ def test_anything():
     result.stdout.fnmatch_lines(['*TEST: populating=False,ready=True*'])
 
 
-def test_django_settings_is_configured():
-    assert django_settings_is_configured() is False
-
-
-def test_no_ds_but_django_imported(testdir):
+def test_no_ds_but_django_imported(testdir, monkeypatch):
     """pytest-django should not bail out, if "django" has been imported
     somewhere, e.g. via pytest-splinter."""
+
+    monkeypatch.delenv('DJANGO_SETTINGS_MODULE')
+
     testdir.makepyfile("""
         import os
         import django
 
+        from pytest_django.lazy_django import django_settings_is_configured
+
+        def test_django_settings_is_configured():
+            assert django_settings_is_configured() is False
+
         def test_env():
             assert 'DJANGO_SETTINGS_MODULE' not in os.environ