Tests: Log reworked.

All log-related code moved to the log.py.

2 files changed, 81 insertions, 11 deletions

diff --git a/test/unit/applications/proto.py b/test/unit/applications/proto.py
index f4d4afe4..3f4c13d3 100644
--- a/test/unit/applications/proto.py
+++ b/test/unit/applications/proto.py
@@ -17,12 +17,10 @@ class TestApplicationProto(TestControl):
         return time.mktime(time.strptime(date, template))
 
     def findall(self, pattern, name='unit.log', flags=re.M):
-        with Log.open(name) as f:
-            return re.findall(pattern, f.read(), flags)
+        return re.findall(pattern, Log.read(name), flags)
 
     def search_in_log(self, pattern, name='unit.log', flags=re.M):
-        with Log.open(name) as f:
-            return re.search(pattern, f.read(), flags)
+        return re.search(pattern, Log.read(name), flags)
 
     def wait_for_record(self, pattern, name='unit.log', wait=150, flags=re.M):
         with Log.open(name) as f:
diff --git a/test/unit/log.py b/test/unit/log.py
index f984d7a1..c98054d5 100644
--- a/test/unit/log.py
+++ b/test/unit/log.py
@@ -1,23 +1,95 @@
+import os
+import re
+import sys
+
+from unit.option import option
+
 UNIT_LOG = 'unit.log'
 
 
+def print_log_on_assert(func):
+    def inner_function(*args, **kwargs):
+        try:
+            func(*args, **kwargs)
+        except AssertionError as exception:
+            Log.print_log(*args, **kwargs)
+            raise exception
+
+    return inner_function
+
+
 class Log:
-    temp_dir = None
     pos = {}
 
+    @staticmethod
+    @print_log_on_assert
+    def check_alerts(log=None):
+        if log is None:
+            log = Log.read(encoding='utf-8')
+
+        found = False
+        alerts = re.findall(r'.+\[alert\].+', log)
+
+        if alerts:
+            found = True
+
+            if option.detailed:
+                print('\nAll alerts/sanitizer errors found in log:')
+                _ = [print(alert) for alert in alerts]
+
+        if option.skip_alerts:
+            for skip in option.skip_alerts:
+                alerts = [al for al in alerts if re.search(skip, al) is None]
+
+        assert not alerts, 'alert(s)'
+
+        if not option.skip_sanitizer:
+            sanitizer_errors = re.findall('.+Sanitizer.+', log)
+
+            assert not sanitizer_errors, 'sanitizer error(s)'
+
+        if found and option.detailed:
+            print('skipped.')
+
+    @staticmethod
+    def get_path(name=UNIT_LOG):
+        return f'{option.temp_dir}/{name}'
+
+    @staticmethod
     def open(name=UNIT_LOG, encoding=None):
-        f = open(Log.get_path(name), 'r', encoding=encoding, errors='ignore')
-        f.seek(Log.pos.get(name, 0))
+        file = open(Log.get_path(name), 'r', encoding=encoding, errors='ignore')
+        file.seek(Log.pos.get(name, 0))
+
+        return file
+
+    @staticmethod
+    def print_log(log=None):
+        Log.print_path()
 
-        return f
+        if option.print_log:
+            os.set_blocking(sys.stdout.fileno(), True)
+            sys.stdout.flush()
 
+            if log is None:
+                log = Log.read(encoding='utf-8')
+
+            sys.stdout.write(log)
+
+    @staticmethod
+    def print_path():
+        print(f'Path to {UNIT_LOG}:\n{Log.get_path()}\n')
+
+    @staticmethod
+    def read(*args, **kwargs):
+        with Log.open(*args, **kwargs) as file:
+            return file.read()
+
+    @staticmethod
     def set_pos(pos, name=UNIT_LOG):
         Log.pos[name] = pos
 
+    @staticmethod
     def swap(name):
         pos = Log.pos.get(UNIT_LOG, 0)
         Log.pos[UNIT_LOG] = Log.pos.get(name, 0)
         Log.pos[name] = pos
-
-    def get_path(name=UNIT_LOG):
-        return f'{Log.temp_dir}/{name}'