Log line reference fix for Python 3.11

Author: HardNorth

CHANGELOG.md

@@ -1,6 +1,8 @@
 # Changelog
 
 ## [Unreleased]
+### Fixed
+ - Log line reference for Python 3.11, by @HardNorth
 ### Changed
 - Client version updated on [5.4.0](https://github.com/reportportal/client-Python/releases/tag/5.4.0), by @HardNorth
 

pytest_reportportal/rp_logging.py

@@ -1,5 +1,6 @@
 """RPLogger class for low-level logging in tests."""
 
+import sys
 import logging
 import threading
 from contextlib import contextmanager
@@ -108,7 +109,17 @@ def _log(self, *args, **kwargs):
                 if attachment is not None:
                     kwargs.setdefault('extra', {}).update(
                         {'attachment': attachment})
-                return original_func(self, *args, **kwargs)
+                #  Python 3.11 start catches stack frames in wrappers,
+                #  so add additional stack level skip to not show it
+                if sys.version_info >= (3, 11):
+                    my_kwargs = kwargs.copy()
+                    if 'stacklevel' in kwargs:
+                        my_kwargs['stacklevel'] = my_kwargs['stacklevel'] + 1
+                    else:
+                        my_kwargs['stacklevel'] = 2
+                    return original_func(self, *args, **my_kwargs)
+                else:
+                    return original_func(self, *args, **kwargs)
 
             return _log
 

tests/integration/test_config_handling.py

@@ -131,14 +131,7 @@ def test_rp_log_format(mock_client_init):
     expect(mock_client.log.call_count == 1)
     message = mock_client.log.call_args_list[0][0][1]
     expect(len(message) > 0)
-    if sys.version_info < (3, 11):
-        expect(message == '(examples.test_rp_logging) ' + LOG_MESSAGE +
-               ' (test_rp_logging.py:24)')
-    else:
-        # FIXME: implement stacktrace preserve solution for Python 3.11
-        warnings.warn('FIXME: implement stacktrace preserve solution for Python 3.11', RuntimeWarning)
-        expect(message == '(examples.test_rp_logging) ' + LOG_MESSAGE +
-               ' (rp_logging.py:111)')
+    expect(message == f'(examples.test_rp_logging) {LOG_MESSAGE} (test_rp_logging.py:24)')
     assert_expectations()