Merge branch 'master' into speedup_initdb

Author: ildus

.gitignore

@@ -1,2 +1,3 @@
 *.pyc
-dist
+dist
+tags

README.md

@@ -93,3 +93,4 @@ Please see `testgres/tests` directory for replication configuration example.
 
 Ildar Musin <i.musin(at)postgrespro.ru> Postgres Professional Ltd., Russia     
 Dmitry Ivanov <d.ivanov(at)postgrespro.ru> Postgres Professional Ltd., Russia   
+Ildus Kurbangaliev <i.kurbangaliev(at)postgrespro.ru> Postgres Professional Ltd., Russia

setup.py

@@ -2,7 +2,7 @@
 setup(
     name='testgres',
     packages=['testgres'],
-    version='0.2.0',
+    version='0.3.0',
     description='Testing utility for postgresql and its extensions',
     license='PostgreSQL',
     author='Ildar Musin',

testgres/testgres.py

@@ -476,6 +476,9 @@ def stop(self, params={}):
         _params.update(params)
         self.pg_ctl("stop", _params)
 
+        if self.logger:
+            self.logger.stop()
+
         self.working = False
 
         return self

testgres/tests/test_simple.py

@@ -1,5 +1,10 @@
+#!/usr/bin/env python
+
 import unittest
+import re
 import six
+import tempfile
+import logging.config
 
 from testgres import get_new_node, stop_all
 
@@ -78,6 +83,49 @@ def test_users(self):
         self.assertEqual(value, six.b('1\n'))
         node.stop()
 
+    def test_logging(self):
+        regex = re.compile('\w+:\s{1}LOG:.*')
+        logfile = tempfile.NamedTemporaryFile('w', delete=True)
+
+        log_conf = {
+            'version': 1,
+            'handlers': {
+                'file': {
+                    'class': 'logging.FileHandler',
+                    'filename': logfile.name,
+                    'formatter': 'base_format',
+                    'level': logging.DEBUG,
+                },
+            },
+            'formatters': {
+                'base_format': {
+                    'format': '%(node)-5s: %(message)s',
+                },
+            },
+            'root': {
+                'handlers': ('file', ),
+                'level': 'DEBUG',
+            },
+        }
+
+        logging.config.dictConfig(log_conf)
+
+        node = get_new_node('master', use_logging=True)
+        node1 = get_new_node('slave1', use_logging=True)
+        node2 = get_new_node('slave2', use_logging=True)
+
+        node.init().start()
+        node1.init().start()
+        node2.init().start()
+
+        with open(logfile.name, 'r') as log:
+            for line in log:
+                self.assertTrue(regex.match(line))
+
+        node.stop()
+        node1.stop()
+        node2.stop()
+
 
 if __name__ == '__main__':
     unittest.main()