Fix tests for pg_dump and pg_restore

Author: Fenimorkin

.gitignore

@@ -1,12 +1,17 @@
 *.pyc
-dist
-tags
-*.egg-info/
 *.egg
-Dockerfile
-.coverage
+*.egg-info/
+dist
+
 env/
 venv/
 build/
+
+.coverage
 coverage.xml
+
+Dockerfile
+
+*~
 *.swp
+tags

README.md

@@ -154,11 +154,9 @@ with testgres.get_new_node('master') as master:
     # start a new node
     master.init().start()
 
-    # initialize default database for TPC-B
-    master.pgbench_run(options=['-i'])
-
-    # run benchmark for 20 seconds and show results
-    print(master.pgbench_run(options=['-T', '20']))
+    # initialize default DB and run bench for 10 seconds
+    res = master.pgbench_init(scale=2).pgbench_run(time=10)
+    print(res)
 ```
 
 

testgres/backup.py

@@ -7,16 +7,17 @@
 from six import raise_from
 
 from .consts import \
-    DATA_DIR as _DATA_DIR, \
-    BACKUP_LOG_FILE as _BACKUP_LOG_FILE, \
-    DEFAULT_XLOG_METHOD as _DEFAULT_XLOG_METHOD
+    DATA_DIR, \
+    PG_CONF_FILE, \
+    BACKUP_LOG_FILE, \
+    DEFAULT_XLOG_METHOD
 
 from .exceptions import BackupException
 
 from .utils import \
     get_bin_path, \
-    default_username as _default_username, \
-    execute_utility as _execute_utility
+    default_username, \
+    execute_utility
 
 
 class NodeBackup(object):
@@ -26,13 +27,13 @@ class NodeBackup(object):
 
     @property
     def log_file(self):
-        return os.path.join(self.base_dir, _BACKUP_LOG_FILE)
+        return os.path.join(self.base_dir, BACKUP_LOG_FILE)
 
     def __init__(self,
                  node,
                  base_dir=None,
                  username=None,
-                 xlog_method=_DEFAULT_XLOG_METHOD):
+                 xlog_method=DEFAULT_XLOG_METHOD):
         """
         Create a new backup.
 
@@ -47,7 +48,7 @@ def __init__(self,
             raise BackupException('Node must be running')
 
         # Set default arguments
-        username = username or _default_username()
+        username = username or default_username()
         base_dir = base_dir or tempfile.mkdtemp()
 
         # public
@@ -58,7 +59,7 @@ def __init__(self,
         # private
         self._available = True
 
-        data_dir = os.path.join(self.base_dir, _DATA_DIR)
+        data_dir = os.path.join(self.base_dir, DATA_DIR)
 
         # yapf: disable
         _params = [
@@ -69,7 +70,7 @@ def __init__(self,
             "-D", data_dir,
             "-X", xlog_method
         ]
-        _execute_utility(_params, self.log_file)
+        execute_utility(_params, self.log_file)
 
     def __enter__(self):
         return self
@@ -97,8 +98,8 @@ def _prepare_dir(self, destroy):
         if available:
             dest_base_dir = tempfile.mkdtemp()
 
-            data1 = os.path.join(self.base_dir, _DATA_DIR)
-            data2 = os.path.join(dest_base_dir, _DATA_DIR)
+            data1 = os.path.join(self.base_dir, DATA_DIR)
+            data2 = os.path.join(dest_base_dir, DATA_DIR)
 
             try:
                 # Copy backup to new data dir
@@ -139,8 +140,8 @@ def spawn_primary(self, name=None, destroy=True, use_logging=False):
         # New nodes should always remove dir tree
         node._should_rm_dirs = True
 
-        node.append_conf("postgresql.conf", "\n")
-        node.append_conf("postgresql.conf", "port = {}".format(node.port))
+        node.append_conf(PG_CONF_FILE, "\n")
+        node.append_conf(PG_CONF_FILE, "port = {}".format(node.port))
 
         return node
 

testgres/cache.py

@@ -15,7 +15,7 @@
 
 from .utils import \
     get_bin_path, \
-    execute_utility as _execute_utility
+    execute_utility
 
 
 def cached_initdb(data_dir, initdb_logfile, initdb_params=[]):
@@ -26,7 +26,7 @@ def cached_initdb(data_dir, initdb_logfile, initdb_params=[]):
     def call_initdb(initdb_dir):
         try:
             _params = [get_bin_path("initdb"), "-D", initdb_dir, "-N"]
-            _execute_utility(_params + initdb_params, initdb_logfile)
+            execute_utility(_params + initdb_params, initdb_logfile)
         except ExecUtilException as e:
             raise_from(InitNodeException("Failed to run initdb"), e)
 

testgres/connection.py

@@ -12,7 +12,11 @@
 from enum import Enum
 
 from .exceptions import QueryException
-from .utils import default_username as _default_username
+
+from .utils import \
+    default_dbname, \
+    default_username
+
 
 # export these exceptions
 InternalError = pglib.InternalError
@@ -32,26 +36,34 @@ class NodeConnection(object):
     Transaction wrapper returned by Node
     """
 
-    def __init__(self,
-                 parent_node,
-                 dbname,
-                 host="127.0.0.1",
-                 username=None,
-                 password=None):
+    def __init__(self, node, dbname=None, username=None, password=None):
 
-        # Use default user if not specified
-        username = username or _default_username()
+        # Set default arguments
+        dbname = dbname or default_dbname()
+        username = username or default_username()
 
-        self.parent_node = parent_node
+        self._node = node
 
-        self.connection = pglib.connect(
+        self._connection = pglib.connect(
             database=dbname,
             user=username,
-            port=parent_node.port,
-            host=host,
-            password=password)
+            password=password,
+            host=node.host,
+            port=node.port)
+
+        self._cursor = self.connection.cursor()
+
+    @property
+    def node(self):
+        return self._node
+
+    @property
+    def connection(self):
+        return self._connection
 
-        self.cursor = self.connection.cursor()
+    @property
+    def cursor(self):
+        return self._cursor
 
     def __enter__(self):
         return self
@@ -73,7 +85,7 @@ def begin(self, isolation_level=IsolationLevel.ReadCommitted):
 
             # Get index of isolation level
             level_idx = isolation_level.value
-            assert(level_idx in range(4))
+            assert level_idx in range(4)
 
             # Replace isolation level with its name
             isolation_level = levels[level_idx]

testgres/consts.py

@@ -4,10 +4,15 @@
 DATA_DIR = "data"
 LOGS_DIR = "logs"
 
+RECOVERY_CONF_FILE = "recovery.conf"
+PG_CONF_FILE = "postgresql.conf"
+HBA_CONF_FILE = "pg_hba.conf"
+
 # names for log files
 PG_LOG_FILE = "postgresql.log"
 UTILS_LOG_FILE = "utils.log"
 BACKUP_LOG_FILE = "backup.log"
 
-# default argument value
+# default argument values
 DEFAULT_XLOG_METHOD = "fetch"
+DEFAULT_DUMP_FORMAT = "plain"

testgres/logger.py

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