Merge pull request #36 from ildus/master

funbringer · web-flow · commit 2ceabc0b154d · 2018-02-28T15:21:10.000+03:00
Use kwargs for several functions to move through all possible arguments
diff --git a/testgres/node.py b/testgres/node.py
@@ -30,8 +30,7 @@
     HBA_CONF_FILE, \
     RECOVERY_CONF_FILE, \
     PG_LOG_FILE, \
-    UTILS_LOG_FILE, \
-    DEFAULT_XLOG_METHOD
+    UTILS_LOG_FILE
 
 from .decorators import \
     method_decorator, \
@@ -112,7 +111,7 @@ def __enter__(self):
     def __exit__(self, type, value, traceback):
         self.free_port()
 
-        # NOTE: ctrl+C does not count!
+        # NOTE: Ctrl+C does not count!
         got_exception = type is not None and type != KeyboardInterrupt
 
         c1 = self.cleanup_on_good_exit and not got_exception
@@ -254,19 +253,15 @@ def _collect_special_files(self):
 
         return result
 
-    def init(self,
-             fsync=False,
-             unix_sockets=True,
-             allow_streaming=True,
-             initdb_params=None):
+    def init(self, initdb_params=None, **kwargs):
         """
         Perform initdb for this node.
 
         Args:
+            initdb_params: parameters for initdb (list).
             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:
             This instance of PostgresNode.
@@ -281,9 +276,7 @@ def init(self,
                       params=initdb_params)
 
         # initialize default config files
-        self.default_conf(fsync=fsync,
-                          unix_sockets=unix_sockets,
-                          allow_streaming=allow_streaming)
+        self.default_conf(**kwargs)
 
         return self
 
@@ -682,16 +675,13 @@ def psql(self,
         return process.returncode, out, err
 
     @method_decorator(positional_args_hack(['dbname', 'query']))
-    def safe_psql(self,
-                  query,
-                  dbname=None,
-                  username=None,
-                  input=None):
+    def safe_psql(self, query=None, **kwargs):
         """
         Execute a query using psql.
 
         Args:
             query: query to be executed.
+            filename: file with a query.
             dbname: database name to connect to.
             username: database user name.
             input: raw input to be passed.
@@ -700,10 +690,7 @@ def safe_psql(self,
             psql's output as str.
         """
 
-        ret, out, err = self.psql(query=query,
-                                  dbname=dbname,
-                                  username=username,
-                                  input=input)
+        ret, out, err = self.psql(query=query, **kwargs)
         if ret:
             raise QueryException((err or b'').decode('utf-8'), query)
 
@@ -859,37 +846,34 @@ def execute(self,
 
             return res
 
-    def backup(self, username=None, xlog_method=DEFAULT_XLOG_METHOD):
+    def backup(self, **kwargs):
         """
         Perform pg_basebackup.
 
         Args:
             username: database user name.
             xlog_method: a method for collecting the logs ('fetch' | 'stream').
+            base_dir: the base directory for data files and logs
 
         Returns:
             A smart object of type NodeBackup.
         """
 
         from .backup import NodeBackup
-        return NodeBackup(node=self,
-                          username=username,
-                          xlog_method=xlog_method)
+        return NodeBackup(node=self, **kwargs)
 
-    def replicate(self,
-                  name=None,
-                  username=None,
-                  xlog_method=DEFAULT_XLOG_METHOD):
+    def replicate(self, name=None, **kwargs):
         """
         Create a binary replica of this node.
 
         Args:
             name: replica's application name.
             username: database user name.
             xlog_method: a method for collecting the logs ('fetch' | 'stream').
+            base_dir: the base directory for data files and logs
         """
 
-        backup = self.backup(username=username, xlog_method=xlog_method)
+        backup = self.backup(**kwargs)
 
         # transform backup into a replica
         return backup.spawn_replica(name=name, destroy=True)
