mirror of
https://github.com/outbackdingo/patroni.git
synced 2026-08-25 14:53:37 +00:00
Fix deps compatibility, increase tests coverage i(#3233)
* Compatibility with python-json-logger>=3.1 After refactoring the old API is still working, but producing warnings and pyright also fails. Besides that improve coverage of watchdog/base.py and ctl.py * Stick to ubuntu 22.04 * Please pyright
This commit is contained in:
+7
-2
@@ -13,9 +13,13 @@ from patroni.config import Config
|
||||
from patroni.log import PatroniLogger
|
||||
|
||||
try:
|
||||
from pythonjsonlogger import jsonlogger
|
||||
try:
|
||||
from pythonjsonlogger import json as jsonlogger
|
||||
except ImportError:
|
||||
from pythonjsonlogger import jsonlogger
|
||||
|
||||
jsonlogger.JsonFormatter(None, None, rename_fields={}, static_fields={})
|
||||
|
||||
jsonlogger.JsonFormatter(None, None, rename_fields={}, static_fields={})
|
||||
json_formatter_is_available = True
|
||||
|
||||
import json # we need json.loads() function
|
||||
@@ -274,6 +278,7 @@ class TestPatroniLogger(unittest.TestCase):
|
||||
with self.assertLogs() as captured_log:
|
||||
logger = PatroniLogger()
|
||||
pythonjsonlogger = Mock()
|
||||
pythonjsonlogger.json.JsonFormatter = Mock(side_effect=Exception)
|
||||
pythonjsonlogger.jsonlogger.JsonFormatter = Mock(side_effect=Exception)
|
||||
with patch('builtins.__import__', Mock(return_value=pythonjsonlogger)):
|
||||
logger.reload_config({'type': 'json'})
|
||||
|
||||
Reference in New Issue
Block a user