improve logging, make tests more reliable

Author: funbringer

testgres/testgres.py

@@ -158,8 +158,10 @@ def run(self):
                 # do we have new lines?
                 if fd in select.select([fd], [], [], 0)[0]:
                     for line in fd.readlines():
-                        extra = {'node': self._node_name}
-                        self._logger.info(line, extra=extra)
+                        line = line.strip()
+                        if line:
+                            extra = {'node': self._node_name}
+                            self._logger.info(line, extra=extra)
                 else:
                     time.sleep(0.1)
 

tests/test_simple.py

@@ -7,6 +7,7 @@
 import subprocess
 import tempfile
 import testgres
+import time
 import unittest
 
 import logging.config
@@ -408,21 +409,22 @@ def test_logging(self):
 
         logging.config.dictConfig(log_conf)
 
-        with get_new_node('master', use_logging=True) as master:
+        node_name = 'master'
+        with get_new_node(node_name, use_logging=True) as master:
             master.init().start()
 
             # execute a dummy query a few times
             for i in range(20):
                 master.execute('postgres', 'select 1')
+                time.sleep(0.01)
 
             # let logging worker do the job
-            import time
-            time.sleep(0.5)
+            time.sleep(0.1)
 
             # check that master's port is found
             with open(logfile.name, 'r') as log:
                 lines = log.readlines()
-                self.assertTrue(any('select' in s for s in lines))
+                self.assertTrue(any(node_name in s for s in lines))
 
     def test_pgbench(self):
         with get_new_node('node') as node: