Renamed inp to input, added test for it, fixed restart logging.

node.restart() logging was previously broken: -l option was not supplied, so its
stdout/err wasn't redirected -- this is option of pg_ctl, not of postgres
itself, and pg_ctl didn't reused it. That was also the reason of 'write_to_pipe'
existence: if pg_ctl restart's stdout was fed to pipe, communicate() hanged,
reading stdout of postgres infinitely. Now we ride on 'start' routine for
restart and get the same behaviour, including logging.

'inp' param of safe_psql and psql was renamed to input for consistency (we don't
use here standard input() function quite often, right?), test for it was added.

Author: arssher

testgres/testgres.py

@@ -677,11 +677,12 @@ def get_control_data(self):
 
         return out_dict
 
-    def start(self, params=[]):
+    def start(self, restart=False, params=[]):
         """
-        Start this node using pg_ctl.
+        (Re)start this node using pg_ctl.
 
         Args:
+            restart: restart or start?
             params: additional arguments for _execute_utility().
 
         Returns:
@@ -706,8 +707,9 @@ def start(self, params=[]):
         # choose recovery_filename
         recovery_filename = os.path.join(self.data_dir, "recovery.conf")
 
+        action = "restart" if restart else "start"
         _params = [
-            "start",
+            action,
             "-D{}".format(self.data_dir),
             "-l{}".format(log_filename),
             "-w"
@@ -727,7 +729,7 @@ def print_node_file(node_file):
                 return "### file not found ###\n"
 
             error_text = (
-                u"Cannot start node\n"
+                u"Cannot {} node\n".format(action) +
                 u"{}\n"  # pg_ctl log
                 u"{}:\n----\n{}\n"  # postgresql.log
                 u"{}:\n----\n{}\n"  # postgresql.conf
@@ -773,10 +775,10 @@ def restart(self, params=[]):
             This instance of PostgresNode.
         """
 
-        _params = ["restart", "-D", self.data_dir, "-w"] + params
-        _execute_utility("pg_ctl", _params,
-                         self.utils_logname,
-                         write_to_pipe=True)
+        if self.logger:
+            self.logger.stop()
+
+        self.start(restart=True, params=params)
 
         return self
 
@@ -845,7 +847,7 @@ def cleanup(self, max_attempts=3):
 
         return self
 
-    def psql(self, dbname, query=None, filename=None, username=None, inp=None):
+    def psql(self, dbname, query=None, filename=None, username=None, input=None):
         """
         Execute a query using psql.
 
@@ -886,10 +888,10 @@ def psql(self, dbname, query=None, filename=None, username=None, inp=None):
                                    stderr=subprocess.PIPE)
 
         # wait until it finishes and get stdout and stderr
-        out, err = process.communicate(input=inp)
+        out, err = process.communicate(input=input)
         return process.returncode, out, err
 
-    def safe_psql(self, dbname, query, username=None, inp=None):
+    def safe_psql(self, dbname, query, username=None, input=None):
         """
         Execute a query using psql.
 
@@ -902,7 +904,7 @@ def safe_psql(self, dbname, query, username=None, inp=None):
             psql's output as str.
         """
 
-        ret, out, err = self.psql(dbname, query, username=username, inp=inp)
+        ret, out, err = self.psql(dbname, query, username=username, input=input)
         if ret:
             err = '' if not err else err.decode('utf-8')
             raise QueryException(err)
@@ -1201,29 +1203,24 @@ def rm_cached_data_dir(rm_dir):
             raise InitNodeException(_explain_exception(e))
 
 
-def _execute_utility(util, args, logfile, write_to_pipe=True):
+def _execute_utility(util, args, logfile):
     """
     Execute utility (pg_ctl, pg_dump etc) using get_bin_path().
 
     Args:
         util: utility to be executed.
         args: arguments for utility (list).
         logfile: path to file to store stdout and stderr.
-        write_to_pipe: do we care about stdout?
 
     Returns:
         stdout of executed utility.
     """
 
     # we can't use subprocess.DEVNULL on 2.7
     with open(os.devnull, "w") as devnull:
-
-        # choose file according to options
-        stdout_file = subprocess.PIPE if write_to_pipe else devnull
-
         # run utility
         process = subprocess.Popen([get_bin_path(util)] + args,
-                                   stdout=stdout_file,
+                                   stdout=subprocess.PIPE,
                                    stderr=subprocess.STDOUT)
 
         # get result

tests/test_simple.py

@@ -102,6 +102,19 @@ def test_psql(self):
             res = node.safe_psql('postgres', 'select 1')
             self.assertEqual(res, b'1\n')
 
+            # check feeding input
+            node.safe_psql('postgres', 'create table horns (w int)')
+            node.safe_psql('postgres', 'copy horns from stdin (format csv)',
+                           input=
+b"""1
+2
+3
+\.
+""")
+            sum = node.safe_psql('postgres', 'select sum(w) from horns')
+            self.assertEqual(sum, b'6\n')
+            node.safe_psql('postgres', 'drop table horns')
+
             node.stop()
 
             # check psql on stopped node