Added fix for unittest launch and linter issues in the release branch

SubCoder1 · SubCoder1 · commit 149e5eb3e685 · 2025-03-17T23:00:35.000+05:30
This patch fixes the issue where bootstrapped mysql-9.3.0 server is
trying to initialize to run the unittests by setting a value for the
non-existent server variable `innodb_log_file_size`. Also, typing
and linter issues are resolved.

Change-Id: I39266fa3516958a6e875022bfca80e39d0f64b43
diff --git a/mysql-connector-python/lib/mysql/connector/aio/plugins/authentication_webauthn_client.py b/mysql-connector-python/lib/mysql/connector/aio/plugins/authentication_webauthn_client.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -195,7 +195,7 @@ def auth_response(self, auth_data: bytes, **kwargs: Any) -> Optional[bytes]:
         if device is not None:
             logger.debug("WebAuthn - Use USB HID channel")
         elif CTAP_PCSC_DEVICE_AVAILABLE:
-            device = next(CtapPcscDevice.list_devices(), None)
+            device = next(CtapPcscDevice.list_devices(), None)  # type: ignore[arg-type]
 
         if device is None:
             raise errors.InterfaceError("No FIDO device found")
diff --git a/mysql-connector-python/lib/mysql/connector/conversion.py b/mysql-connector-python/lib/mysql/connector/conversion.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2009, 2025, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -26,8 +26,7 @@
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
-"""Converting MySQL and Python types
-"""
+"""Converting MySQL and Python types"""
 
 import array
 import datetime
diff --git a/mysql-connector-python/lib/mysql/connector/cursor_cext.py b/mysql-connector-python/lib/mysql/connector/cursor_cext.py
@@ -61,7 +61,7 @@
     ParamsSequenceType,
     RowItemType,
     RowType,
-    StrOrBytes,
+    StrOrBytesAny,
     WarningType,
 )
 
@@ -1090,7 +1090,7 @@ def reset(self, free: bool = True) -> None:
 
     def execute(
         self,
-        operation: StrOrBytes,
+        operation: StrOrBytesAny,
         params: Optional[ParamsSequenceOrDictType] = None,
         map_results: bool = False,
     ) -> None:
diff --git a/mysql-connector-python/lib/mysql/connector/django/base.py b/mysql-connector-python/lib/mysql/connector/django/base.py
@@ -143,7 +143,7 @@ def __init__(self, cursor: "MySQLCursorAbstract") -> None:
 
     @staticmethod
     def _adapt_execute_args_dict(
-        args: Dict[str, MySQLConvertibleType]
+        args: Dict[str, MySQLConvertibleType],
     ) -> Dict[str, MySQLConvertibleType]:
         if not args:
             return args
diff --git a/mysql-connector-python/lib/mysql/connector/plugins/authentication_webauthn_client.py b/mysql-connector-python/lib/mysql/connector/plugins/authentication_webauthn_client.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -194,7 +194,7 @@ def auth_response(self, auth_data: bytes, **kwargs: Any) -> Optional[bytes]:
         if device is not None:
             logger.debug("WebAuthn - Use USB HID channel")
         elif CTAP_PCSC_DEVICE_AVAILABLE:
-            device = next(CtapPcscDevice.list_devices(), None)
+            device = next(CtapPcscDevice.list_devices(), None)  # type: ignore[arg-type]
 
         if device is None:
             raise errors.InterfaceError("No FIDO device found")
diff --git a/mysql-connector-python/lib/mysql/connector/types.py b/mysql-connector-python/lib/mysql/connector/types.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -36,6 +36,7 @@
 from time import struct_time
 from typing import (
     TYPE_CHECKING,
+    Any,
     Deque,
     Dict,
     List,
@@ -62,6 +63,9 @@ class MySQLScriptPartition(TypedDict):
 StrOrBytes = Union[str, bytes]
 """Shortcut to for `String or Bytes`."""
 
+StrOrBytesAny = Union[StrOrBytes, Any]
+"""Shortcut to for `String or Bytes or Any`."""
+
 StrOrBytesPath = Union[StrOrBytes, os.PathLike]
 """Shortcut to for `String or Bytes or os.PathLike` - this shortcut
 may come in handy as a hint for path-like variables."""
diff --git a/mysql-connector-python/tests/mysqld.py b/mysql-connector-python/tests/mysqld.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2009, 2025, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -458,7 +458,6 @@ def _get_bootstrap_cmd(self):
             "--default-storage-engine=myisam",
             "--net_buffer_length=16K",
             "--tmpdir=%s" % self._tmpdir,
-            "--innodb_log_file_size=1Gb",
         ]
 
         if self._version[0:2] >= (8, 0) or self._version >= (5, 7, 21):
@@ -468,6 +467,7 @@ def _get_bootstrap_cmd(self):
             cmd.append("--bootstrap")
 
         if self._version < (8, 0, 3):
+            cmd.append("--innodb_log_file_size=1Gb")
             cmd.append("--log-warnings=0")
 
         if self._version[0:2] < (5, 5):
diff --git a/mysql-connector-python/unittests.py b/mysql-connector-python/unittests.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2009, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2009, 2025, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -149,7 +149,6 @@ def filter(self, record: logging.LogRecord):
 log-bin = mysqld_{name}_bin
 local_infile = 1
 innodb_flush_log_at_trx_commit = 2
-innodb_log_file_size = 1Gb
 general_log_file = general_{name}.log
 {secure_file_priv}
 """
@@ -741,7 +740,13 @@ def init_mysql_server(port, options):
                     "::" if tests.IPV6_AVAILABLE else "0.0.0.0"
                 )
             },
-        }
+        },
+        {
+            "version": (8, 0, 30),
+            "options": {
+                "innodb_log_file_size": "1Gb",
+            },
+        },
     ]
 
     if options.secure_file_priv is not None:
diff --git a/mysqlx-connector-python/lib/mysqlx/connection.py b/mysqlx-connector-python/lib/mysqlx/connection.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2016, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2016, 2025, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -1785,7 +1785,7 @@ def _get_pools(self, settings: Dict[str, Any]) -> List:
 
     @staticmethod
     def _get_connections_settings(
-        settings: Dict[str, Any]
+        settings: Dict[str, Any],
     ) -> List[Tuple[str, Dict[str, Any]]]:
         """Generates a list of separated connection settings for each host.
 
diff --git a/mysqlx-connector-python/lib/mysqlx/protocol.py b/mysqlx-connector-python/lib/mysqlx/protocol.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2016, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2016, 2025, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -1032,7 +1032,7 @@ def build_execute_statement(
 
     @staticmethod
     def build_insert(
-        stmt: Union[AddStatement, InsertStatement]
+        stmt: Union[AddStatement, InsertStatement],
     ) -> Tuple[str, MessageType]:
         """Build insert statement.
 
diff --git a/mysqlx-connector-python/lib/mysqlx/result.py b/mysqlx-connector-python/lib/mysqlx/result.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2016, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2016, 2025, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -83,7 +83,7 @@ def varint_from_protobuf_stream(payload: bytes) -> Tuple[int, bytes]:
     shift = 0
 
     for item in payload:
-        char = item if isinstance(item, int) else ord(item)  # type: ignore[arg-type]
+        char = item if isinstance(item, int) else ord(item)
         eos = (char & 0x80) == 0
         cur_bits = char & 0x7F
         cur_bits <<= shift
@@ -144,11 +144,11 @@ def set_from_protobuf(payload: bytes) -> List[bytes]:
 def decimal_from_protobuf(payload: bytes) -> decimal.Decimal:
     digits = []
     sign = None
-    scale = payload[0] if isinstance(payload[0], int) else ord(payload[0])  # type: ignore[arg-type]
+    scale = payload[0] if isinstance(payload[0], int) else ord(payload[0])
     payload = payload[1:]
 
     for item in payload:
-        char = item if isinstance(item, int) else ord(item)  # type: ignore[arg-type]
+        char = item if isinstance(item, int) else ord(item)
         high_bcd = (char & 0xF0) >> 4
         low_bcd = char & 0x0F
         if high_bcd < 0x0A:
diff --git a/mysqlx-connector-python/tests/mysqld.py b/mysqlx-connector-python/tests/mysqld.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2009, 2025, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -458,7 +458,6 @@ def _get_bootstrap_cmd(self):
             "--default-storage-engine=myisam",
             "--net_buffer_length=16K",
             "--tmpdir=%s" % self._tmpdir,
-            "--innodb_log_file_size=1Gb",
         ]
 
         if self._version[0:2] >= (8, 0) or self._version >= (5, 7, 21):
@@ -468,6 +467,7 @@ def _get_bootstrap_cmd(self):
             cmd.append("--bootstrap")
 
         if self._version < (8, 0, 3):
+            cmd.append("--innodb_log_file_size=1Gb")
             cmd.append("--log-warnings=0")
 
         if self._version[0:2] < (5, 5):
diff --git a/mysqlx-connector-python/unittests.py b/mysqlx-connector-python/unittests.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2009, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2009, 2025, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -134,7 +134,6 @@
 log-bin = mysqld_{name}_bin
 local_infile = 1
 innodb_flush_log_at_trx_commit = 2
-innodb_log_file_size = 1Gb
 general_log_file = general_{name}.log
 {secure_file_priv}
 """
@@ -468,7 +467,13 @@ def init_mysql_server(port, options):
                     "::" if tests.IPV6_AVAILABLE else "0.0.0.0"
                 )
             },
-        }
+        },
+        {
+            "version": (8, 0, 30),
+            "options": {
+                "innodb_log_file_size": "1Gb",
+            },
+        },
     ]
 
     if options.secure_file_priv is not None:
