Fix "raise_if_test" behaviour

golem/core/log.py

@@ -8,8 +8,10 @@
 from logging.handlers import RotatingFileHandler
 from typing import Optional, Tuple, Union
 
-from golem.utilities.singleton_meta import SingletonMeta
+from typing_extensions import Literal
+
 from golem.core.paths import default_data_dir
+from golem.utilities.singleton_meta import SingletonMeta
 
 DEFAULT_LOG_PATH = pathlib.Path(default_data_dir(), 'log.log')
 
@@ -156,50 +158,43 @@ def __init__(self, logger: logging.Logger, extra: dict):
         self.logging_level = logger.level
         self.setLevel(self.logging_level)
 
+    def log_or_raise(
+            self, level: Union[int, Literal['debug', 'info', 'warning', 'error', 'critical', 'message']],
+            exc: Exception,
+            from_: Optional[Exception] = None,
+            **log_kwargs):
+        # Raise if test session
+        is_test_session_ = is_test_session()
+        if is_test_session_ and from_ is not None:
+            raise exc from from_
+        elif is_test_session_:
+            raise exc
+        # Log otherwise
+        level_map = {
+            'debug': logging.DEBUG,
+            'info': logging.INFO,
+            'warning': logging.WARNING,
+            'error': logging.ERROR,
+            'critical': logging.CRITICAL,
+            'message': 45,
+        }
+        if isinstance(level, str):
+            level = level_map[level]
+        super().log(level, exc,
+                    exc_info=log_kwargs.pop('exc_info', None) or from_ or exc,
+                    stacklevel=log_kwargs.pop('stacklevel', 2),
+                    **log_kwargs)
+
     def process(self, msg, kwargs):
         self.logger.setLevel(self.logging_level)
         return '%s - %s' % (self.extra['prefix'], msg), kwargs
 
-    def debug(self, msg, *args, **kwargs):
-        raise_if_test(msg, **kwargs)
-        super().debug(msg, *args, **kwargs)
-
-    def info(self, msg, *args, **kwargs):
-        raise_if_test(msg, **kwargs)
-        super().info(msg, *args, **kwargs)
-
-    def warning(self, msg, *args, **kwargs):
-        raise_if_test(msg, **kwargs)
-        super().warning(msg, *args, **kwargs)
-
-    def error(self, msg, *args, **kwargs):
-        raise_if_test(msg, **kwargs)
-        super().error(msg, *args, **kwargs)
-
-    def exception(self, msg, *args, exc_info=True, **kwargs):
-        raise_if_test(msg, **kwargs)
-        super().exception(msg, *args, **kwargs)
-
-    def critical(self, msg, *args, **kwargs):
-        raise_if_test(msg, **kwargs)
-        super().critical(msg, *args, **kwargs)
-
-    def log(self, level, msg, *args, **kwargs):
-        """
-        Delegate a log call to the underlying logger, after adding
-        contextual information from this adapter instance.
-        """
-        raise_if_test(msg, **kwargs)
-        super().log(level, msg, *args, **kwargs)
-
     def message(self, msg: str, **kwargs):
         """ Record the message to user.
         Message is an intermediate logging level between info and warning
         to display main info about optimization process """
-        raise_if_test(msg, **kwargs)
-        message_logging_level = 45
-        if message_logging_level >= self.logging_level:
-            self.critical(msg=msg)
+        level = 45
+        self.log(level, msg, **kwargs)
 
     def __str__(self):
         return f'LoggerAdapter object for {self.extra["prefix"]} module'
@@ -208,11 +203,6 @@ def __repr__(self):
         return self.__str__()
 
 
-def raise_if_test(msg, **kwargs):
-    if kwargs.get('raise_if_test', False) is True and is_test_session:
-        raise Exception(msg)
-
-
 def is_test_session():
     return 'PYTEST_CURRENT_TEST' in os.environ
 

golem/core/optimisers/opt_history_objects/individual.py

@@ -115,14 +115,14 @@ def __eq__(self, other: Individual):
         return self.uid == other.uid
 
     def __copy__(self):
-        default_log(self).warning(INDIVIDUAL_COPY_RESTRICTION_MESSAGE, raise_if_test=True)
+        default_log(self).log_or_raise('warning', AssertionError(INDIVIDUAL_COPY_RESTRICTION_MESSAGE))
         cls = self.__class__
         result = cls.__new__(cls)
         result.__dict__.update(self.__dict__)
         return result
 
     def __deepcopy__(self, memo):
-        default_log(self).warning(INDIVIDUAL_COPY_RESTRICTION_MESSAGE, raise_if_test=True)
+        default_log(self).log_or_raise('warning', AssertionError(INDIVIDUAL_COPY_RESTRICTION_MESSAGE))
         cls = self.__class__
         result = cls.__new__(cls)
         memo[id(self)] = result