remove pgbench_init(), add pgbench_run(), add self.host here and there

Author: funbringer

README.md

@@ -139,9 +139,14 @@ with testgres.get_new_node('master') as master:
 
 ```python
 with testgres.get_new_node('master') as master:
+    # start new node
     master.init().start()
-    p = master.pg_bench_init(scale=10).pgbench(options=['-T', '60'])
-    p.wait()
+
+    # initialize database for TPC-B
+    master.pgbench_run(options=['-i'])
+
+    # run benchmark for 20 seconds and show results
+    print(master.pgbench_run(options=['-T', '20']))
 ```
 
 ## Authors

testgres/backup.py

@@ -53,6 +53,7 @@ def __init__(self,
         _params = [
             get_bin_path("pg_basebackup"),
             "-p", str(node.port),
+            "-h", node.host,
             "-U", username,
             "-D", data_dir,
             "-X", xlog_method

testgres/node.py

@@ -645,6 +645,7 @@ def dump(self, dbname, username=None, filename=None):
         _params = [
             get_bin_path("pg_dump"),
             "-p", str(self.port),
+            "-h", self.host,
             "-f", filename,
             "-U", username,
             "-d", dbname
@@ -816,50 +817,52 @@ def catchup(self, dbname='postgres', username=None):
         except Exception as e:
             raise CatchUpException(_explain_exception(e))
 
-    def pgbench_init(self, dbname='postgres', scale=1, options=[]):
+    def pgbench(self, dbname='postgres', stdout=None, stderr=None, options=[]):
         """
-        Prepare database for pgbench (create tables etc).
+        Spawn a pgbench process.
 
         Args:
             dbname: database name to connect to.
-            scale: report this scale factor in output (int).
+            stdout: stdout file to be used by Popen.
+            stderr: stderr file to be used by Popen.
             options: additional options for pgbench (list).
 
         Returns:
-            This instance of PostgresNode.
+            Process created by subprocess.Popen.
         """
 
         # yapf: disable
         _params = [
             get_bin_path("pgbench"),
             "-p", str(self.port),
-            "-s", str(scale),
-            "-i",  # initialize
+            "-h", self.host,
         ] + options + [dbname]
 
-        _execute_utility(_params, self.utils_log_name)
+        proc = subprocess.Popen(_params, stdout=stdout, stderr=stderr)
 
-        return self
+        return proc
 
-    def pgbench(self, dbname='postgres', stdout=None, stderr=None, options=[]):
+    def pgbench_run(self, dbname='postgres', options=[]):
         """
-        Spawn a pgbench process.
+        Run pgbench with some options.
+        This event is logged (see self.utils_log_name).
 
         Args:
             dbname: database name to connect to.
-            stdout: stdout file to be used by Popen.
-            stderr: stderr file to be used by Popen.
             options: additional options for pgbench (list).
 
         Returns:
-            Process created by subprocess.Popen.
+            Stdout produced by pgbench.
         """
 
-        pgbench = get_bin_path("pgbench")
-        params = [pgbench, "-p", str(self.port)] + options + [dbname]
-        proc = subprocess.Popen(params, stdout=stdout, stderr=stderr)
+        # yapf: disable
+        _params = [
+            get_bin_path("pgbench"),
+            "-p", str(self.port),
+            "-h", self.host,
+        ] + options + [dbname]
 
-        return proc
+        return _execute_utility(_params, self.utils_log_name)
 
     def connect(self, dbname='postgres', username=None):
         """

tests/test_simple.py

@@ -503,8 +503,12 @@ def test_logging(self):
         util_is_executable("pgbench"), "pgbench may be missing")
     def test_pgbench(self):
         with get_new_node('node') as node:
-            node.init().start().pgbench_init()
+            node.init().start()
+
+            # initialize pgbench
+            node.pgbench_run(options=['-i'])
 
+            # run TPC-B benchmark
             proc = node.pgbench(
                 stdout=subprocess.PIPE,
                 stderr=subprocess.STDOUT,