Some refactoring of logical replication API and formatting

Author: zilder

testgres/node.py

@@ -501,8 +501,9 @@ def get_auth_method(t):
 
             if allow_logical:
                 if not pg_version_ge('10'):
-                    raise InitNodeException("Logical replication is only "
-                                            "available for Postgres 10 and newer")
+                    raise InitNodeException(
+                        "Logical replication is only available for Postgres 10 "
+                        "and newer")
                 conf.write(u"wal_level = logical\n")
 
             # disable UNIX sockets if asked to
@@ -1022,11 +1023,7 @@ def catchup(self, dbname=None, username=None):
         except Exception as e:
             raise_from(CatchUpException("Failed to catch up", poll_lsn), e)
 
-    def publish(self,
-                name,
-                tables=None,
-                dbname=None,
-                username=None):
+    def publish(self, name, **kwargs):
         """
         Create publication for logical replication
 
@@ -1036,25 +1033,26 @@ def publish(self,
             dbname: database name where objects or interest are located
             username: replication username
         """
-        return Publication(name=name, node=self, tables=tables, dbname=dbname,
-                           username=username)
+        return Publication(name=name, node=self, **kwargs)
 
-    def subscribe(self,
-                  publication,
-                  name,
-                  dbname=None,
-                  username=None,
-                  **kwargs):
+    def subscribe(self, publication, name, dbname=None, username=None,
+                  **params):
         """
         Create subscription for logical replication
 
         Args:
-            subname: subscription name
+            name: subscription name
             publication: publication object obtained from publish()
-
+            dbname: database name
+            username: replication username
+            params: subscription parameters (see documentation on `CREATE SUBSCRIPTION
+                 <https://www.postgresql.org/docs/current/static/sql-createsubscription.html>`_
+                 for details)
         """
+        # yapf: disable
         return Subscription(name=name, node=self, publication=publication,
-                            dbname=dbname, username=username, **kwargs)
+                            dbname=dbname, username=username, **params)
+        # yapf: enable
 
     def pgbench(self,
                 dbname=None,

testgres/pubsub.py

@@ -106,7 +106,7 @@ def __init__(self,
                  publication,
                  dbname=None,
                  username=None,
-                 **kwargs):
+                 **params):
         """
         Constructor. Use :meth:`.PostgresNode.subscribe()` instead of direct
         constructing subscription objects.
@@ -118,8 +118,9 @@ def __init__(self,
                 (see :meth:`.PostgresNode.publish()`)
             dbname: database name used to connect and perform subscription
             username: username used to connect to the database
-            **kwargs: subscription parameters (see ``CREATE SUBSCRIPTION``
-                in PostgreSQL documentation for more information)
+            params: subscription parameters (see documentation on `CREATE SUBSCRIPTION
+                 <https://www.postgresql.org/docs/current/static/sql-createsubscription.html>`_
+                 for details)
         """
         self.name = name
         self.node = node
@@ -138,8 +139,8 @@ def __init__(self,
                 name, options_string(**conninfo), self.pub.name)
 
         # additional parameters
-        if kwargs:
-            query += " with ({})".format(options_string(**kwargs))
+        if params:
+            query += " with ({})".format(options_string(**params))
 
         node.safe_psql(query, dbname=dbname, username=username)