Fix failed tests due to subtle changes in Python 3.11

Author: pcisar

tests/test_config.py

@@ -1248,9 +1248,12 @@ def test_proto(self):
         self.assertEqual(cm.exception.args, ('Wrong value type: uint32',))
         self.proto.Clear()
         self.proto.options['option_name'].as_uint64 = 1000
-        with self.assertRaises(ValueError) as cm:
-            opt.load_proto(self.proto)
-        self.assertEqual(cm.exception.args, ("Illegal value 'SimpleIntFlag.512|256|128|64|32|FOUR' for flag option 'option_name'",))
+        # Python 3.11 changed how flag boundaries are checked, default is more benevolent
+        # see https://docs.python.org/3.11/library/enum.html#enum.FlagBoundary.KEEP
+        if int(platform.python_version_tuple()[1]) < 11:
+            with self.assertRaises(ValueError) as cm:
+                opt.load_proto(self.proto)
+            self.assertEqual(cm.exception.args, ("Illegal value 'SimpleIntFlag.512|256|128|64|32|FOUR' for flag option 'option_name'",))
         self.proto.Clear()
         opt.clear(to_default=False)
         opt.save_proto(self.proto)

tests/test_logging.py

@@ -38,6 +38,7 @@
 
 from __future__ import annotations
 import unittest
+import platform
 from logging import getLogger, Formatter, lastResort, LogRecord
 from firebird.base.types import *
 from firebird.base.logging import logging_manager, get_logger, bind_logger, \
@@ -78,6 +79,10 @@ def test_module(self):
         self.assertIsNotNone(lastResort)
         self.assertIsNotNone(lastResort.formatter)
     def test_aaa(self):
+        if int(platform.python_version_tuple()[1]) < 11:
+            AGENT = 'test_aaa (test_logging.TestLogging)'
+        else:
+            AGENT = 'test_aaa (test_logging.TestLogging.test_aaa)'
         # root
         with self.assertLogs() as log:
             get_logger(self).info('Message')
@@ -89,7 +94,7 @@ def test_aaa(self):
         self.assertEqual(rec.filename, 'test_logging.py')
         self.assertEqual(rec.funcName, 'test_aaa')
         self.assertEqual(rec.topic, '')
-        self.assertEqual(rec.agent, 'test_aaa (test_logging.TestLogging)')
+        self.assertEqual(rec.agent, AGENT)
         self.assertEqual(rec.context, UNDEFINED)
         self.assertEqual(rec.message, 'Message')
         # trace
@@ -103,7 +108,7 @@ def test_aaa(self):
         self.assertEqual(rec.filename, 'test_logging.py')
         self.assertEqual(rec.funcName, 'test_aaa')
         self.assertEqual(rec.topic, 'trace')
-        self.assertEqual(rec.agent, 'test_aaa (test_logging.TestLogging)')
+        self.assertEqual(rec.agent, AGENT)
         self.assertEqual(rec.context, UNDEFINED)
         self.assertEqual(rec.message, 'Message')
     def test_interpolation(self):