Merge branch 'master' into no-port-for

Author: funny-falcon

.travis.yml

@@ -1,4 +1,6 @@
-sudo: required
+os: linux
+
+dist: bionic
 
 language: python
 
@@ -18,14 +20,15 @@ notifications:
         on_failure: always
 
 env:
-    - PYTHON_VERSION=2 PG_VERSION=10
-    - PYTHON_VERSION=2 PG_VERSION=9.6
-    - PYTHON_VERSION=2 PG_VERSION=9.5
-    - PYTHON_VERSION=2 PG_VERSION=9.4
+    - PYTHON_VERSION=3 PG_VERSION=14
     - PYTHON_VERSION=3 PG_VERSION=13
     - PYTHON_VERSION=3 PG_VERSION=12
     - PYTHON_VERSION=3 PG_VERSION=11
     - PYTHON_VERSION=3 PG_VERSION=10
-    - PYTHON_VERSION=3 PG_VERSION=9.6
-    - PYTHON_VERSION=3 PG_VERSION=9.5
-    - PYTHON_VERSION=3 PG_VERSION=9.4
+#    - PYTHON_VERSION=3 PG_VERSION=9.6
+#    - PYTHON_VERSION=3 PG_VERSION=9.5
+#    - PYTHON_VERSION=3 PG_VERSION=9.4
+#    - PYTHON_VERSION=2 PG_VERSION=10
+#    - PYTHON_VERSION=2 PG_VERSION=9.6
+#    - PYTHON_VERSION=2 PG_VERSION=9.5
+#    - PYTHON_VERSION=2 PG_VERSION=9.4

setup.py

@@ -21,7 +21,7 @@
     readme = f.read()
 
 setup(
-    version='1.8.4',
+    version='1.8.5',
     name='testgres',
     packages=['testgres'],
     description='Testing utility for PostgreSQL and its extensions',

testgres/backup.py

@@ -29,7 +29,6 @@ class NodeBackup(object):
     """
     Smart object responsible for backups
     """
-
     @property
     def log_file(self):
         return os.path.join(self.base_dir, BACKUP_LOG_FILE)

testgres/cache.py

@@ -25,7 +25,6 @@ def cached_initdb(data_dir, logfile=None, params=None):
     """
     Perform initdb or use cached node files.
     """
-
     def call_initdb(initdb_dir, log=None):
         try:
             _params = [get_bin_path("initdb"), "-D", initdb_dir, "-N"]

testgres/config.py

@@ -43,7 +43,6 @@ class GlobalConfig(object):
 
     _cached_initdb_dir = None
     """ underlying class attribute for cached_initdb_dir property """
-
     @property
     def cached_initdb_dir(self):
         """ path to a temp directory for cached initdb. """

testgres/connection.py

@@ -28,7 +28,6 @@ class NodeConnection(object):
     """
     Transaction wrapper returned by Node
     """
-
     def __init__(self,
                  node,
                  dbname=None,
@@ -42,12 +41,11 @@ def __init__(self,
 
         self._node = node
 
-        self._connection = pglib.connect(
-            database=dbname,
-            user=username,
-            password=password,
-            host=node.host,
-            port=node.port)
+        self._connection = pglib.connect(database=dbname,
+                                         user=username,
+                                         password=password,
+                                         host=node.host,
+                                         port=node.port)
 
         self._connection.autocommit = autocommit
         self._cursor = self.connection.cursor()

testgres/decorators.py

@@ -50,7 +50,6 @@ def method_decorator(decorator):
     """
     Convert a function decorator into a method decorator.
     """
-
     def _dec(func):
         def _wrapper(self, *args, **kwargs):
             @decorator

testgres/logger.py

@@ -10,7 +10,6 @@ class TestgresLogger(threading.Thread):
     """
     Helper class to implement reading from log files.
     """
-
     def __init__(self, node_name, log_file_name):
         threading.Thread.__init__(self)
 

testgres/node.py

@@ -6,7 +6,11 @@
 import subprocess
 import time
 
-from collections import Iterable
+try:
+    from collections.abc import Iterable
+except ImportError:
+    from collections import Iterable
+
 from shutil import rmtree
 from six import raise_from, iteritems, text_type
 from tempfile import mkstemp, mkdtemp
@@ -91,7 +95,6 @@ class ProcessProxy(object):
         process: wrapped psutill.Process object
         ptype: instance of ProcessType
     """
-
     def __init__(self, process, ptype=None):
         self.process = process
         self.ptype = ptype or ProcessType.from_process(process)
@@ -196,7 +199,6 @@ def auxiliary_processes(self):
         Returns a list of auxiliary processes.
         Each process is represented by :class:`.ProcessProxy` object.
         """
-
         def is_aux(process):
             return process.ptype != ProcessType.Unknown
 
@@ -430,10 +432,9 @@ 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)
@@ -480,8 +481,8 @@ def default_conf(self,
             if allow_streaming:
                 # get auth method for host or local users
                 def get_auth_method(t):
-                    return next((s.split()[-1] for s in lines
-                                 if s.startswith(t)), 'trust')
+                    return next((s.split()[-1]
+                                 for s in lines if s.startswith(t)), 'trust')
 
                 # get auth methods
                 auth_local = get_auth_method('local')
@@ -760,12 +761,11 @@ def promote(self, dbname=None, username=None):
         if self._pg_version < '10':
             check_query = "SELECT pg_is_in_recovery()"
 
-            self.poll_query_until(
-                query=check_query,
-                expected=False,
-                dbname=dbname,
-                username=username,
-                max_attempts=0)    # infinite
+            self.poll_query_until(query=check_query,
+                                  expected=False,
+                                  dbname=dbname,
+                                  username=username,
+                                  max_attempts=0)    # infinite
 
         # node becomes master itself
         self._master = None
@@ -884,11 +884,10 @@ def psql(self,
         psql_params.append(dbname)
 
         # start psql process
-        process = subprocess.Popen(
-            psql_params,
-            stdin=subprocess.PIPE,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE)
+        process = subprocess.Popen(psql_params,
+                                   stdin=subprocess.PIPE,
+                                   stdout=subprocess.PIPE,
+                                   stderr=subprocess.PIPE)
 
         # wait until it finishes and get stdout and stderr
         out, err = process.communicate(input=input)
@@ -1043,11 +1042,10 @@ def poll_query_until(self,
         attempts = 0
         while max_attempts == 0 or attempts < max_attempts:
             try:
-                res = self.execute(
-                    dbname=dbname,
-                    query=query,
-                    username=username,
-                    commit=commit)
+                res = self.execute(dbname=dbname,
+                                   query=query,
+                                   username=username,
+                                   commit=commit)
 
                 if expected is None and res is None:
                     return    # done
@@ -1165,8 +1163,8 @@ def set_synchronous_standbys(self, standbys):
                 standbys = First(1, standbys)
         else:
             if isinstance(standbys, Iterable):
-                standbys = u", ".join(
-                    u"\"{}\"".format(r.name) for r in standbys)
+                standbys = u", ".join(u"\"{}\"".format(r.name)
+                                      for r in standbys)
             else:
                 raise TestgresException("Feature isn't supported in "
                                         "Postgres 9.5 and below")
@@ -1195,11 +1193,10 @@ def catchup(self, dbname=None, username=None):
                                       username=username)[0][0]  # yapf: disable
 
             # wait until this LSN reaches replica
-            self.poll_query_until(
-                query=wait_lsn.format(lsn),
-                dbname=dbname,
-                username=username,
-                max_attempts=0)    # infinite
+            self.poll_query_until(query=wait_lsn.format(lsn),
+                                  dbname=dbname,
+                                  username=username,
+                                  max_attempts=0)    # infinite
         except Exception as e:
             raise_from(CatchUpException("Failed to catch up", poll_lsn), e)
 
@@ -1215,7 +1212,11 @@ def publish(self, name, **kwargs):
         """
         return Publication(name=name, node=self, **kwargs)
 
-    def subscribe(self, publication, name, dbname=None, username=None,
+    def subscribe(self,
+                  publication,
+                  name,
+                  dbname=None,
+                  username=None,
                   **params):
         """
         Create subscription for logical replication

testgres/pubsub.py

@@ -77,10 +77,9 @@ def drop(self, dbname=None, username=None):
         """
         Drop publication
         """
-        self.node.execute(
-            "drop publication {}".format(self.name),
-            dbname=dbname,
-            username=username)
+        self.node.execute("drop publication {}".format(self.name),
+                          dbname=dbname,
+                          username=username)
 
     def add_tables(self, tables, dbname=None, username=None):
         """
@@ -94,10 +93,9 @@ def add_tables(self, tables, dbname=None, username=None):
             raise ValueError("Tables list is empty")
 
         query = "alter publication {} add table {}"
-        self.node.execute(
-            query.format(self.name, ", ".join(tables)),
-            dbname=dbname or self.dbname,
-            username=username or self.username)
+        self.node.execute(query.format(self.name, ", ".join(tables)),
+                          dbname=dbname or self.dbname,
+                          username=username or self.username)
 
 
 class Subscription(object):
@@ -165,19 +163,17 @@ def refresh(self, copy_data=True, dbname=None, username=None):
         Disables the running subscription.
         """
         query = "alter subscription {} refresh publication with (copy_data={})"
-        self.node.execute(
-            query.format(self.name, copy_data),
-            dbname=dbname,
-            username=username)
+        self.node.execute(query.format(self.name, copy_data),
+                          dbname=dbname,
+                          username=username)
 
     def drop(self, dbname=None, username=None):
         """
         Drops subscription
         """
-        self.node.execute(
-            "drop subscription {}".format(self.name),
-            dbname=dbname,
-            username=username)
+        self.node.execute("drop subscription {}".format(self.name),
+                          dbname=dbname,
+                          username=username)
 
     def catchup(self, username=None):
         """
@@ -191,7 +187,9 @@ def catchup(self, username=None):
                                             dbname=None,
                                             username=None)[0][0]  # yapf: disable
             # create dummy xact, as LR replicates only on commit.
-            self.pub.node.execute(query="select txid_current()", dbname=None, username=None)
+            self.pub.node.execute(query="select txid_current()",
+                                  dbname=None,
+                                  username=None)
             query = """
             select '{}'::pg_lsn - replay_lsn <= 0
             from pg_catalog.pg_stat_replication where application_name = '{}'

testgres/standby.py

@@ -16,14 +16,14 @@ class First:
         standbys (:obj:`list` of :class:`.PostgresNode`): the list of standby
             nodes
     """
-
     def __init__(self, sync_num, standbys):
         self.sync_num = sync_num
         self.standbys = standbys
 
     def __str__(self):
-        return u"{} ({})".format(self.sync_num, u", ".join(
-            u"\"{}\"".format(r.name) for r in self.standbys))
+        return u"{} ({})".format(
+            self.sync_num,
+            u", ".join(u"\"{}\"".format(r.name) for r in self.standbys))
 
 
 @six.python_2_unicode_compatible
@@ -39,11 +39,11 @@ class Any:
         standbys (:obj:`list` of :class:`.PostgresNode`): the list of standby
             nodes
     """
-
     def __init__(self, sync_num, standbys):
         self.sync_num = sync_num
         self.standbys = standbys
 
     def __str__(self):
-        return u"ANY {} ({})".format(self.sync_num, u", ".join(
-            u"\"{}\"".format(r.name) for r in self.standbys))
+        return u"ANY {} ({})".format(
+            self.sync_num,
+            u", ".join(u"\"{}\"".format(r.name) for r in self.standbys))

testgres/utils.py

@@ -70,8 +70,7 @@ def execute_utility(args, logfile=None):
         process = subprocess.Popen(
             args,    # util + params
             stdout=buf,
-            stderr=subprocess.STDOUT
-            )
+            stderr=subprocess.STDOUT)
         process.communicate()
 
         # get result
@@ -113,8 +112,10 @@ def execute_utility(args, logfile=None):
     exit_code = process.returncode
     if exit_code:
         message = 'Utility exited with non-zero code'
-        raise ExecUtilException(
-            message=message, command=command, exit_code=exit_code, out=out)
+        raise ExecUtilException(message=message,
+                                command=command,
+                                exit_code=exit_code,
+                                out=out)
 
     return out
 
@@ -153,7 +154,6 @@ def get_pg_config(pg_config_path=None):
     Return output of pg_config (provided that it is installed).
     NOTE: this fuction caches the result by default (see GlobalConfig).
     """
-
     def cache_pg_config_data(cmd):
         # execute pg_config and get the output
         out = subprocess.check_output([cmd]).decode('utf-8')