Normalize error

vshepard · vshepard · commit 3b959328ac1e · 2024-07-04T02:12:06.000+02:00
diff --git a/testgres/node.py b/testgres/node.py
@@ -1165,7 +1165,6 @@ def poll_query_until(self,
         assert sleep_time > 0
         attempts = 0
         while max_attempts == 0 or attempts < max_attempts:
-            logging.info(f"Pooling {attempts}")
             try:
                 res = self.execute(dbname=dbname,
                                    query=query,
@@ -1189,6 +1188,7 @@ def poll_query_until(self,
                     return    # done
 
             except tuple(suppress or []):
+                logging.info(f"Trying execute, attempt {attempts + 1}.\nQuery: {query}")
                 pass    # we're suppressing them
 
             time.sleep(sleep_time)
diff --git a/testgres/operations/remote_ops.py b/testgres/operations/remote_ops.py
@@ -93,8 +93,10 @@ def exec_command(self, cmd, wait_exit=False, verbose=False, expect_error=False,
         if not error:
             error_found = 0
         else:
+            error = normalize_error(error)
             error_found = exit_status != 0 or any(
-                marker in error for marker in [b'error', b'Permission denied', b'fatal', b'No such file or directory'])
+                marker in error for marker in ['error', 'Permission denied', 'fatal', 'No such file or directory']
+            )
 
         if error_found:
             if isinstance(error, bytes):
@@ -369,3 +371,9 @@ def db_connect(self, dbname, user, password=None, host="localhost", port=5432):
             password=password,
         )
         return conn
+
+
+def normalize_error(error):
+    if isinstance(error, bytes):
+        return error.decode()
+    return error
diff --git a/testgres/utils.py b/testgres/utils.py
@@ -6,8 +6,6 @@
 import logging
 import os
 
-import sys
-
 from contextlib import contextmanager
 from packaging.version import Version, InvalidVersion
 import re
