Minor refactoring

zilder · zilder · commit f4e0bd0e1c8e · 2018-03-22T17:45:21.000+03:00
diff --git a/testgres/node.py b/testgres/node.py
@@ -1032,7 +1032,7 @@ def catchup(self, dbname=None, username=None):
             raise_from(CatchUpException("Failed to catch up", poll_lsn), e)
 
     def publish(self,
-                pubname,
+                name,
                 tables=None,
                 dbname=None,
                 username=None):
@@ -1045,11 +1045,12 @@ def publish(self,
             dbname: database name where objects or interest are located
             username: replication username
         """
-        return Publication(pubname, self, tables, dbname, username)
+        return Publication(name=name, node=self, tables=tables, dbname=dbname,
+                           username=username)
 
     def subscribe(self,
                   publication,
-                  subname,
+                  name,
                   dbname=None,
                   username=None,
                   **kwargs):
@@ -1061,10 +1062,8 @@ def subscribe(self,
             publication: publication object obtained from publish()
 
         """
-        return Subscription(subname, self, publication,
-                            dbname=dbname,
-                            username=username,
-                            **kwargs)
+        return Subscription(name=name, node=self, publication=publication,
+                            dbname=dbname, username=username, **kwargs)
 
     def pgbench(self,
                 dbname=None,
diff --git a/testgres/pubsub.py b/testgres/pubsub.py
@@ -8,26 +8,26 @@
 
 
 class Publication(object):
-    def __init__(self, pubname, node, tables=None, dbname=None, username=None):
+    def __init__(self, name, node, tables=None, dbname=None, username=None):
         """
         Constructor
 
         Args:
-            pubname: publication name
+            name: publication name
             node: publisher's node
             tables: tables list or None for all tables
             dbname: database name used to connect and perform subscription
             username: username used to connect to the database
         """
-        self.name = pubname
+        self.name = name
         self.node = node
         self.dbname = dbname or default_dbname()
         self.username = username or default_username()
 
         # create publication in database
-        t = 'table ' + ', '.join(tables) if tables else 'all tables'
+        t = "table " + ", ".join(tables) if tables else "all tables"
         query = "create publication {} for {}"
-        node.safe_psql(query.format(pubname, t),
+        node.safe_psql(query.format(name, t),
                        dbname=dbname,
                        username=username)
 
@@ -49,14 +49,14 @@ def add_tables(self, tables, dbname=None, username=None):
             raise ValueError("Tables list is empty")
 
         query = "alter publication {} add table {}"
-        self.node.safe_psql(query.format(self.name, ', '.join(tables)),
+        self.node.safe_psql(query.format(self.name, ", ".join(tables)),
                             dbname=dbname or self.dbname,
                             username=username or self.username)
 
 
 class Subscription(object):
     def __init__(self,
-                 subname,
+                 name,
                  node,
                  publication,
                  dbname=None,
@@ -66,15 +66,15 @@ def __init__(self,
         Constructor
 
         Args:
-            subname: subscription name
+            name: subscription name
             node: subscriber's node
             publication: Publication object we are subscribing to
             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)
         """
-        self.name = subname
+        self.name = name
         self.node = node
         self.pub = publication
 
@@ -88,7 +88,7 @@ def __init__(self,
 
         query = (
             "create subscription {} connection '{}' publication {}"
-        ).format(subname, options_string(**conninfo), self.pub.name)
+        ).format(name, options_string(**conninfo), self.pub.name)
 
         # additional parameters
         if kwargs:
