BUG#34710366: Django implementation does not pass unit tests

oscpache · oscpache · commit bff8a187956c · 2022-10-18T10:53:37.000-05:00
The Django unit tests implementation is not working as
expected. The issues happen when using recent Django
versions such as 4.1, 4.1.1 or 4.1.2. Changes integrated
by these releases are breaking the current django unit
tests implementation.

With this patch some minor changes are made for Django unit
tests code, hence restoring its correct functioning when
used with Django v3 or v4.

Change-Id: I87fba541cf93425b156629be95af862b5abab01f
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -13,6 +13,7 @@ v8.0.32
 
 - WL#15348: Support MIT Kerberos library on Windows
 - WL#15036: Support for type hints
+- BUG#34710366: Django implementation does not pass unit tests
 - BUG#34689812: Fix datetime conversion when using prepared cursors
 - BUG#34556157: Kerberos authorization fails when using SSPI as security interface
 - BUG#34499578: MySQLCursor.executemany() fails to correctly identify BULK data loading ops
diff --git a/tests/test_django.py b/tests/test_django.py
@@ -58,14 +58,15 @@
             "ENGINE": "mysql.connector.django",
             "NAME": DBCONFIG["database"],
             "USER": "root",
-            "PASSWORD": "",
+            "PASSWORD": DBCONFIG.get("password", ""),
             "HOST": DBCONFIG["host"],
             "PORT": DBCONFIG["port"],
             "TEST_CHARSET": "utf8",
             "TEST_COLLATION": "utf8_general_ci",
             "CONN_MAX_AGE": 0,
             "AUTOCOMMIT": True,
             "TIME_ZONE": None,
+            "CONN_HEALTH_CHECKS": False,
         },
     }
     settings.SECRET_KEY = "django_tests_secret_key"
@@ -131,6 +132,7 @@ class DjangoSettings(tests.MySQLConnectorTests):
     def test_get_connection_params(self):
         config = tests.get_mysql_config()
         settings_dict = connection.settings_dict.copy()
+        settings_dict["OPTIONS"] = {}
 
         # The default isolation_level should be None
         database_wrapper = DatabaseWrapper(settings_dict)
@@ -485,8 +487,6 @@ class CustomDjangoMySQLConverterTests(tests.MySQLConnectorTests):
 
     @staticmethod
     def create_connection(alias=DEFAULT_DB_ALIAS):
-        django.db.connections.ensure_defaults(alias)
-        django.db.connections.prepare_test_settings(alias)
         db = django.db.connections.databases[alias]
         backend = load_backend(db["ENGINE"])
         return backend.DatabaseWrapper(db, alias)
