add unix_sockets=True to init() and default_conf()

Author: funbringer

testgres/backup.py

@@ -32,6 +32,15 @@ def __init__(self,
                  base_dir=None,
                  username=None,
                  xlog_method=_DEFAULT_XLOG_METHOD):
+        """
+        Create a new backup.
+
+        Args:
+            node: PostgresNode we're going to backup.
+            base_dir: where should we store it?
+            username: database user name.
+            xlog_method: none | fetch | stream (see docs)
+        """
 
         if not node.status():
             raise BackupException('Node must be running')
@@ -43,6 +52,7 @@ def __init__(self,
         # public
         self.original_node = node
         self.base_dir = base_dir
+        self.username = username
 
         # private
         self._available = True
@@ -148,7 +158,8 @@ def spawn_replica(self, name, destroy=True, use_logging=False):
         """
 
         node = self.spawn_primary(name, destroy, use_logging=use_logging)
-        node._create_recovery_conf(self.original_node)
+        node._create_recovery_conf(username=self.username,
+                                   master=self.original_node)
 
         return node
 

testgres/node.py

@@ -112,13 +112,20 @@ def utils_log_name(self):
     def pg_log_name(self):
         return os.path.join(self.data_dir, _PG_LOG_FILE)
 
-    @property
-    def connstr(self):
-        return "port={}".format(self.port)
+    def _create_recovery_conf(self, username, master):
+        # yapf: disable
+        conninfo = (
+            u"user={} "
+            u"port={} "
+            u"host={} "
+            u"application_name={}"
+        ).format(username, master.port, master.host, master.name)
 
-    def _create_recovery_conf(self, root_node):
-        line = ("primary_conninfo='{} application_name={}'\n"
-                "standby_mode=on\n").format(root_node.connstr, self.name)
+        # yapf: disable
+        line = (
+            "primary_conninfo='{}'\n"
+            "standby_mode=on\n"
+        ).format(conninfo)
 
         self.append_conf("recovery.conf", line)
 
@@ -175,13 +182,18 @@ def print_node_file(node_file):
 
         return error_text
 
-    def init(self, allow_streaming=False, fsync=False, initdb_params=[]):
+    def init(self,
+             fsync=False,
+             unix_sockets=True,
+             allow_streaming=False,
+             initdb_params=[]):
         """
         Perform initdb for this node.
 
         Args:
-            allow_streaming: should this node add a hba entry for replication?
             fsync: should this node use fsync to keep data safe?
+            unix_sockets: should we enable UNIX sockets?
+            allow_streaming: should this node add a hba entry for replication?
             initdb_params: parameters for initdb (list).
 
         Returns:
@@ -196,22 +208,25 @@ def init(self, allow_streaming=False, fsync=False, initdb_params=[]):
         _cached_initdb(self.data_dir, initdb_log, initdb_params)
 
         # initialize default config files
-        self.default_conf(allow_streaming=allow_streaming, fsync=fsync)
+        self.default_conf(fsync=fsync,
+                          unix_sockets=unix_sockets,
+                          allow_streaming=allow_streaming)
 
         return self
 
     def default_conf(self,
-                     allow_streaming=False,
                      fsync=False,
+                     unix_sockets=True,
+                     allow_streaming=False,
                      log_statement='all'):
         """
         Apply default settings to this node.
 
         Args:
-            allow_streaming: should this node add a hba entry for replication?
             fsync: should this node use fsync to keep data safe?
-            log_statement: one of ('all', 'off', 'mod', 'ddl'), look at
-                PostgreSQL docs for more information
+            unix_sockets: should we enable UNIX sockets?
+            allow_streaming: should this node add a hba entry for replication?
+            log_statement: one of ('all', 'off', 'mod', 'ddl').
 
         Returns:
             This instance of PostgresNode.
@@ -258,6 +273,9 @@ def get_auth_method(t):
 
         # overwrite postgresql.conf file
         with io.open(postgres_conf, "w") as conf:
+            # remove old lines
+            conf.truncate()
+
             if not fsync:
                 conf.write(u"fsync = off\n")
 
@@ -287,6 +305,10 @@ def get_auth_method(t):
                                                       wal_keep_segments,
                                                       wal_level))
 
+            # disable UNIX sockets if asked to
+            if not unix_sockets:
+                conf.write(u"unix_socket_directories = ''\n")
+
         return self
 
     def append_conf(self, filename, string):
@@ -784,7 +806,7 @@ def replicate(self,
         """
 
         backup = self.backup(username=username, xlog_method=xlog_method)
-        return backup.spawn_replica(name, use_logging=use_logging)
+        return backup.spawn_replica(name=name, use_logging=use_logging)
 
     def catchup(self, dbname='postgres', username=None):
         """

tests/test_simple.py

@@ -590,6 +590,17 @@ def test_config(self):
         # restore setting
         configure_testgres(cache_pg_config=True)
 
+    def test_unix_sockets(self):
+        with get_new_node('node').init(unix_sockets=False) as node:
+            node.start()
+
+            node.execute('postgres', 'select 1')
+            node.safe_psql('postgres', 'select 1')
+
+            r = node.replicate('r').start()
+            r.execute('postgres', 'select 1')
+            r.safe_psql('postgres', 'select 1')
+
     def test_isolation_levels(self):
         with get_new_node('node').init().start() as node:
             with node.connect() as con: