live_server_helper: improve sqlite in-memory check

This will make it so it's covered by our tests.
pytest-dev · Dec 1, 2021 · 904a995 · 904a995
1 parent f64b252
commit 904a995
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/pytest_django/live_server_helper.py b/pytest_django/live_server_helper.py
@@ -19,11 +19,8 @@ def __init__(self, addr: str) -> None:
         for conn in connections.all():
             # If using in-memory sqlite databases, pass the connections to
             # the server thread.
-            if (
-                conn.settings_dict["ENGINE"] == "django.db.backends.sqlite3"
-                and conn.settings_dict["NAME"] == ":memory:"
-            ):
-                # Explicitly enable thread-shareability for this connection
+            if conn.vendor == 'sqlite' and conn.is_in_memory_db():
+                # Explicitly enable thread-shareability for this connection.
                 conn.inc_thread_sharing()
                 connections_override[conn.alias] = conn
 

diff --git a/pytest_django_test/db_helpers.py b/pytest_django_test/db_helpers.py
@@ -15,6 +15,8 @@
 
 if _settings["ENGINE"] == "django.db.backends.sqlite3" and TEST_DB_NAME is None:
     TEST_DB_NAME = ":memory:"
+    SECOND_DB_NAME = ":memory:"
+    SECOND_TEST_DB_NAME = ":memory:"
 else:
     DB_NAME += "_inner"
 
@@ -25,8 +27,8 @@
         # An explicit test db name was given, is that as the base name
         TEST_DB_NAME = "{}_inner".format(TEST_DB_NAME)
 
-SECOND_DB_NAME = DB_NAME + '_second' if DB_NAME is not None else None
-SECOND_TEST_DB_NAME = TEST_DB_NAME + '_second' if DB_NAME is not None else None
+    SECOND_DB_NAME = DB_NAME + '_second' if DB_NAME is not None else None
+    SECOND_TEST_DB_NAME = TEST_DB_NAME + '_second' if DB_NAME is not None else None
 
 
 def get_db_engine():

diff --git a/pytest_django_test/settings_sqlite.py b/pytest_django_test/settings_sqlite.py
@@ -4,17 +4,17 @@
 DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.sqlite3",
-        "NAME": "/should_not_be_accessed",
+        "NAME": ":memory:",
     },
     "replica": {
         "ENGINE": "django.db.backends.sqlite3",
-        "NAME": "/should_not_be_accessed",
+        "NAME": ":memory:",
         "TEST": {
             "MIRROR": "default",
         },
     },
     "second": {
         "ENGINE": "django.db.backends.sqlite3",
-        "NAME": "/should_not_be_accessed",
+        "NAME": ":memory:",
     },
 }
diff --git a/pytest_django_test/settings_sqlite_file.py b/pytest_django_test/settings_sqlite_file.py
@@ -15,7 +15,9 @@
     "default": {
         "ENGINE": "django.db.backends.sqlite3",
         "NAME": "/pytest_django_tests_default",
-        "TEST": {"NAME": _filename_default},
+        "TEST": {
+            "NAME": _filename_default,
+        },
     },
     "replica": {
         "ENGINE": "django.db.backends.sqlite3",
@@ -28,6 +30,8 @@
     "second": {
         "ENGINE": "django.db.backends.sqlite3",
         "NAME": "/pytest_django_tests_second",
-        "TEST": {"NAME": _filename_second},
+        "TEST": {
+            "NAME": _filename_second,
+        },
     },
 }