fix error in tests, enable streaming by default

Author: funbringer

setup.py

@@ -12,6 +12,10 @@
 if sys.version_info < (3, 4):
     install_requires.append("enum34")
 
+# Add compatibility ipaddress module
+if sys.version_info < (3, 3):
+    install_requires.append("ipaddress")
+
 setup(
     name='testgres',
     packages=['testgres'],

testgres/node.py

@@ -115,11 +115,18 @@ def pg_log_name(self):
     def _create_recovery_conf(self, username, master):
         # yapf: disable
         conninfo = (
-            u"user={} "
+            u"application_name={} "
             u"port={} "
-            u"host={} "
-            u"application_name={}"
-        ).format(username, master.port, master.host, master.name)
+            u"user={} "
+        ).format(master.name, master.port, username)
+
+        # host is tricky
+        try:
+            import ipaddress
+            ipaddress.ip_address(master.host)
+            conninfo += u"hostaddr={}".format(master.host)
+        except ValueError:
+            conninfo += u"host={}".format(master.host)
 
         # yapf: disable
         line = (
@@ -147,7 +154,7 @@ def _maybe_stop_logger(self):
         if self._logger:
             self._logger.stop()
 
-    def _format_verbose_error(self):
+    def _format_verbose_error(self, message=None):
         # list of important files
         files = [
             os.path.join(self.data_dir, "postgresql.conf"),
@@ -158,6 +165,11 @@ def _format_verbose_error(self):
 
         error_text = ""
 
+        # append message if asked to
+        if message:
+            error_text += message
+            error_text += '\n' * 2
+
         for f in files:
             # skip missing files
             if not os.path.exists(f):
@@ -205,7 +217,7 @@ def init(self,
     def default_conf(self,
                      fsync=False,
                      unix_sockets=True,
-                     allow_streaming=False,
+                     allow_streaming=True,
                      log_statement='all'):
         """
         Apply default settings to this node.
@@ -284,8 +296,8 @@ def get_auth_method(t):
                     wal_level = "hot_standby"
 
                 # yapf: disable
-                max_wal_senders = 5
-                wal_keep_segments = 20
+                max_wal_senders = 10    # default in PG 10
+                wal_keep_segments = 20  # for convenience
                 conf.write(u"hot_standby = on\n"
                            u"max_wal_senders = {}\n"
                            u"wal_keep_segments = {}\n"
@@ -399,10 +411,7 @@ def start(self, params=[]):
         try:
             _execute_utility(_params, self.utils_log_name)
         except ExecUtilException as e:
-            msg = (
-                u"Cannot start node\n"
-                u"{}\n"    # pg_ctl log
-            ).format(self._format_verbose_error())
+            msg = self._format_verbose_error('Cannot start node')
             raise_from(StartNodeException(msg), e)
 
         self._maybe_start_logger()
@@ -457,10 +466,7 @@ def restart(self, params=[]):
         try:
             _execute_utility(_params, self.utils_log_name)
         except ExecUtilException as e:
-            msg = (
-                u"Cannot restart node\n"
-                u"{}\n"    # pg_ctl log
-            ).format(self._format_verbose_error())
+            msg = self._format_verbose_error('Cannot restart node')
             raise_from(StartNodeException(msg), e)
 
         self._maybe_start_logger()

tests/test_simple.py

@@ -294,12 +294,12 @@ def test_backup_exhaust(self):
             with node.backup(xlog_method='fetch') as backup:
 
                 # exhaust backup by creating new node
-                with backup.spawn_primary('node1') as node1:  # noqa
+                with backup.spawn_primary('node1') as node1:    # noqa
                     pass
 
                 # now let's try to create one more node
                 with self.assertRaises(BackupException):
-                    with backup.spawn_primary('node2') as node2:  # noqa
+                    with backup.spawn_primary('node2') as node2:    # noqa
                         pass
 
     def test_backup_and_replication(self):
@@ -591,7 +591,8 @@ def test_config(self):
         configure_testgres(cache_pg_config=True)
 
     def test_unix_sockets(self):
-        with get_new_node('node').init(unix_sockets=False) as node:
+        with get_new_node('node') as node:
+            node.init(unix_sockets=False, allow_streaming=True)
             node.start()
 
             node.execute('postgres', 'select 1')