fix yapf pattern usage in node.py

Author: funbringer

testgres/consts.py

@@ -25,5 +25,7 @@
 UTILS_LOG_FILE = "utils.log"
 BACKUP_LOG_FILE = "backup.log"
 
-# default replication slots number
-REPLICATION_SLOTS = 10
+# defaults for node settings
+MAX_REPLICATION_SLOTS = 10
+MAX_WAL_SENDERS = 10
+WAL_KEEP_SEGMENTS = 20

testgres/node.py

@@ -32,8 +32,12 @@
     RECOVERY_CONF_FILE, \
     PG_LOG_FILE, \
     UTILS_LOG_FILE, \
-    PG_PID_FILE, \
-    REPLICATION_SLOTS
+    PG_PID_FILE
+
+from .consts import \
+    MAX_WAL_SENDERS, \
+    MAX_REPLICATION_SLOTS, \
+    WAL_KEEP_SEGMENTS
 
 from .decorators import \
     method_decorator, \
@@ -292,12 +296,11 @@ def _create_recovery_conf(self, username, slot=None):
         master = self.master
         assert master is not None
 
-        # yapf: disable
         conninfo = (
             u"application_name={} "
             u"port={} "
             u"user={} "
-        ).format(self.name, master.port, username)
+        ).format(self.name, master.port, username)  # yapf: disable
 
         # host is tricky
         try:
@@ -307,11 +310,10 @@ def _create_recovery_conf(self, username, slot=None):
         except ValueError:
             conninfo += u"host={}".format(master.host)
 
-        # yapf: disable
         line = (
             "primary_conninfo='{}'\n"
             "standby_mode=on\n"
-        ).format(conninfo)
+        ).format(conninfo)  # yapf: disable
 
         if slot:
             # Connect to master for some additional actions
@@ -325,7 +327,8 @@ def _create_recovery_conf(self, username, slot=None):
                 """, slot)
 
                 if res[0][0]:
-                    raise TestgresException("Slot '{}' already exists".format(slot))
+                    raise TestgresException(
+                        "Slot '{}' already exists".format(slot))
 
                 # TODO: we should drop this slot after replica's cleanup()
                 con.execute("""
@@ -357,7 +360,7 @@ def _collect_special_files(self):
             (os.path.join(self.data_dir, RECOVERY_CONF_FILE), 0),
             (os.path.join(self.data_dir, HBA_CONF_FILE), 0),
             (self.pg_log_file, testgres_config.error_log_lines)
-        ]
+        ]  # yapf: disable
 
         for f, num_lines in files:
             # skip missing files
@@ -392,9 +395,10 @@ def init(self, initdb_params=None, **kwargs):
         """
 
         # initialize this PostgreSQL node
-        cached_initdb(data_dir=self.data_dir,
-                      logfile=self.utils_log_file,
-                      params=initdb_params)
+        cached_initdb(
+            data_dir=self.data_dir,
+            logfile=self.utils_log_file,
+            params=initdb_params)
 
         # initialize default config files
         self.default_conf(**kwargs)
@@ -446,12 +450,11 @@ def get_auth_method(t):
                 auth_local = get_auth_method('local')
                 auth_host = get_auth_method('host')
 
-                # yapf: disable
                 new_lines = [
                     u"local\treplication\tall\t\t\t{}\n".format(auth_local),
                     u"host\treplication\tall\t127.0.0.1/32\t{}\n".format(auth_host),
                     u"host\treplication\tall\t::1/128\t\t{}\n".format(auth_host)
-                ]
+                ]  # yapf: disable
 
                 # write missing lines
                 for line in new_lines:
@@ -466,12 +469,11 @@ def get_auth_method(t):
             if not fsync:
                 conf.write(u"fsync = off\n")
 
-            # yapf: disable
             conf.write(u"log_statement = {}\n"
                        u"listen_addresses = '{}'\n"
                        u"port = {}\n".format(log_statement,
                                              self.host,
-                                             self.port))
+                                             self.port))  # yapf: disable
 
             # replication-related settings
             if allow_streaming:
@@ -482,17 +484,14 @@ def get_auth_method(t):
                 else:
                     wal_level = "hot_standby"
 
-                # yapf: disable
-                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"max_replication_slots = {}\n"
                            u"wal_keep_segments = {}\n"
-                           u"wal_level = {}\n".format(max_wal_senders,
-                                                      REPLICATION_SLOTS,
-                                                      wal_keep_segments,
-                                                      wal_level))
+                           u"wal_level = {}\n".format(MAX_WAL_SENDERS,
+                                                      MAX_REPLICATION_SLOTS,
+                                                      WAL_KEEP_SEGMENTS,
+                                                      wal_level))  # yapf: disable
 
             # disable UNIX sockets if asked to
             if not unix_sockets:
@@ -528,12 +527,11 @@ def status(self):
         """
 
         try:
-            # yapf: disable
             _params = [
                 get_bin_path("pg_ctl"),
                 "-D", self.data_dir,
                 "status"
-            ]
+            ]  # yapf: disable
             execute_utility(_params, self.utils_log_file)
             return NodeStatus.Running
 
@@ -577,14 +575,13 @@ def start(self, params=[]):
             This instance of PostgresNode.
         """
 
-        # yapf: disable
         _params = [
             get_bin_path("pg_ctl"),
             "-D", self.data_dir,
             "-l", self.pg_log_file,
             "-w",  # wait
             "start"
-        ] + params
+        ] + params  # yapf: disable
 
         try:
             execute_utility(_params, self.utils_log_file)
@@ -608,13 +605,12 @@ def stop(self, params=[]):
             This instance of PostgresNode.
         """
 
-        # yapf: disable
         _params = [
             get_bin_path("pg_ctl"),
             "-D", self.data_dir,
             "-w",  # wait
             "stop"
-        ] + params
+        ] + params  # yapf: disable
 
         execute_utility(_params, self.utils_log_file)
 
@@ -633,14 +629,13 @@ def restart(self, params=[]):
             This instance of PostgresNode.
         """
 
-        # yapf: disable
         _params = [
             get_bin_path("pg_ctl"),
             "-D", self.data_dir,
             "-l", self.pg_log_file,
             "-w",  # wait
             "restart"
-        ] + params
+        ] + params  # yapf: disable
 
         try:
             execute_utility(_params, self.utils_log_file)
@@ -664,13 +659,12 @@ def reload(self, params=[]):
             This instance of PostgresNode.
         """
 
-        # yapf: disable
         _params = [
             get_bin_path("pg_ctl"),
             "-D", self.data_dir,
             "-w",  # wait
             "reload"
-        ] + params
+        ] + params  # yapf: disable
 
         execute_utility(_params, self.utils_log_file)
 
@@ -685,12 +679,11 @@ def pg_ctl(self, params):
             Stdout + stderr of pg_ctl.
         """
 
-        # yapf: disable
         _params = [
             get_bin_path("pg_ctl"),
             "-D", self.data_dir,
             "-w"  # wait
-        ] + params
+        ] + params  # yapf: disable
 
         return execute_utility(_params, self.utils_log_file)
 
@@ -753,7 +746,6 @@ def psql(self,
         dbname = dbname or default_dbname()
         username = username or default_username()
 
-        # yapf: disable
         psql_params = [
             get_bin_path("psql"),
             "-p", str(self.port),
@@ -764,7 +756,7 @@ def psql(self,
             "-t",  # print rows only
             "-q",  # run quietly
             dbname
-        ]
+        ]  # yapf: disable
 
         # select query source
         if query:
@@ -831,15 +823,14 @@ def tmpfile():
         username = username or default_username()
         filename = filename or tmpfile()
 
-        # yapf: disable
         _params = [
             get_bin_path("pg_dump"),
             "-p", str(self.port),
             "-h", self.host,
             "-f", filename,
             "-U", username,
             "-d", dbname
-        ]
+        ]  # yapf: disable
 
         execute_utility(_params, self.utils_log_file)
 
@@ -948,7 +939,7 @@ def execute(self,
 
         with self.connect(dbname=dbname,
                           username=username,
-                          password=password) as node_con:
+                          password=password) as node_con:  # yapf: disable
 
             res = node_con.execute(query)
 
@@ -1007,7 +998,7 @@ def catchup(self, dbname=None, username=None):
             # fetch latest LSN
             lsn = self.master.execute(query=poll_lsn,
                                       dbname=dbname,
-                                      username=username)[0][0]
+                                      username=username)[0][0]  # yapf: disable
 
             # wait until this LSN reaches replica
             self.poll_query_until(
@@ -1042,13 +1033,12 @@ def pgbench(self,
         dbname = dbname or default_dbname()
         username = username or default_username()
 
-        # yapf: disable
         _params = [
             get_bin_path("pgbench"),
             "-p", str(self.port),
             "-h", self.host,
             "-U", username,
-        ] + options
+        ] + options  # yapf: disable
 
         # should be the last one
         _params.append(dbname)
@@ -1070,11 +1060,7 @@ def pgbench_init(self, **kwargs):
 
         return self
 
-    def pgbench_run(self,
-                    dbname=None,
-                    username=None,
-                    options=[],
-                    **kwargs):
+    def pgbench_run(self, dbname=None, username=None, options=[], **kwargs):
         """
         Run pgbench with some options.
         This event is logged (see self.utils_log_file).
@@ -1098,13 +1084,12 @@ def pgbench_run(self,
         dbname = dbname or default_dbname()
         username = username or default_username()
 
-        # yapf: disable
         _params = [
             get_bin_path("pgbench"),
             "-p", str(self.port),
             "-h", self.host,
             "-U", username,
-        ] + options
+        ] + options  # yapf: disable
 
         for key, value in iteritems(kwargs):
             # rename keys for pgbench
@@ -1114,7 +1099,7 @@ def pgbench_run(self,
             if not isinstance(value, bool):
                 _params.append('--{}={}'.format(key, value))
             else:
-                assert value is True  # just in case
+                assert value is True    # just in case
                 _params.append('--{}'.format(key))
 
         # should be the last one
@@ -1138,4 +1123,4 @@ def connect(self, dbname=None, username=None, password=None):
         return NodeConnection(node=self,
                               dbname=dbname,
                               username=username,
-                              password=password)
+                              password=password)  # yapf: disable