fix tests for 9.4

Author: funbringer

testgres/backup.py

@@ -48,10 +48,14 @@ def __init__(self,
         self._available = True
 
         data_dir = os.path.join(self.base_dir, _DATA_DIR)
+
+        # yapf: disable
         _params = [
             get_bin_path("pg_basebackup"),
-            "-D{}".format(data_dir), "-p{}".format(node.port),
-            "-U{}".format(username), "-X{}".format(xlog_method)
+            "-p", str(node.port),
+            "-U", username,
+            "-D", data_dir,
+            "-X", xlog_method
         ]
         _execute_utility(_params, self.log_file)
 

testgres/node.py

@@ -352,12 +352,10 @@ def get_control_data(self):
         Return contents of pg_control file.
         """
 
-        # yapf: disable
-        _params = [
-            get_bin_path("pg_controldata"),
-            "-D" if _pg_version_ge('9.5') else '',
-            self.data_dir
-        ]
+        # this one is tricky (blame PG 9.4)
+        _params = [get_bin_path("pg_controldata")]
+        _params += ["-D"] if _pg_version_ge('9.5') else []
+        _params += [self.data_dir]
 
         data = _execute_utility(_params, self.utils_log_name)
 

testgres/utils.py

@@ -10,7 +10,6 @@
 from .config import TestgresConfig
 from .exceptions import ExecUtilException
 
-
 # rows returned by PG_CONFIG
 _pg_config_data = {}
 
@@ -72,7 +71,7 @@ def execute_utility(args, logfile):
 
     # run utility
     process = subprocess.Popen(
-        args,  # util + params
+        args,    # util + params
         stdout=subprocess.PIPE,
         stderr=subprocess.STDOUT)
 

tests/test_simple.py

@@ -21,11 +21,34 @@
     CatchUpException, \
     TimeoutException
 
-from testgres import TestgresConfig
-from testgres import get_new_node, get_pg_config, configure_testgres
+from testgres import \
+    TestgresConfig, \
+    configure_testgres
+
+from testgres import \
+    NodeStatus, \
+    IsolationLevel, \
+    get_new_node
+
+from testgres import \
+    get_bin_path, \
+    get_pg_config
+
 from testgres import bound_ports
-from testgres import NodeStatus
-from testgres import IsolationLevel
+
+
+def util_is_executable(util):
+    exe_file = get_bin_path(util)
+
+    # check if util exists
+    if os.path.exists(exe_file):
+        return True
+
+    # check if util is in PATH
+    for path in os.environ["PATH"].split(os.pathsep):
+        exe_file = os.path.join(path, util)
+        if os.path.exists(exe_file):
+            return True
 
 
 class SimpleTest(unittest.TestCase):
@@ -87,12 +110,19 @@ def test_uninitialized_start(self):
     def test_restart(self):
         with get_new_node('test') as node:
             node.init().start()
+
+            # restart, ok
             res = node.execute('postgres', 'select 1')
             self.assertEqual(res, [(1, )])
             node.restart()
             res = node.execute('postgres', 'select 2')
             self.assertEqual(res, [(2, )])
 
+            # restart, fail
+            with self.assertRaises(StartNodeException):
+                node.append_conf('pg_hba.conf', 'DUMMY')
+                node.restart()
+
     def test_psql(self):
         with get_new_node('test') as node:
             node.init().start()
@@ -409,9 +439,7 @@ def test_poll_query_until(self):
 
             # check ProgrammingError, fail
             with self.assertRaises(testgres.ProgrammingError):
-                node.poll_query_until(
-                    dbname='postgres',
-                    query='dummy1')
+                node.poll_query_until(dbname='postgres', query='dummy1')
 
             # check ProgrammingError, ok
             with self.assertRaises(TimeoutException):
@@ -471,6 +499,8 @@ def test_logging(self):
             master.restart()
             self.assertTrue(master._logger.is_alive())
 
+    @unittest.skipUnless(
+        util_is_executable("pgbench"), "pgbench may be missing")
     def test_pgbench(self):
         with get_new_node('node') as node:
             node.init().start().pgbench_init()
@@ -489,18 +519,17 @@ def test_reload(self):
         with get_new_node('node') as node:
             node.init().start()
 
-            cmd1 = "alter system set client_min_messages = DEBUG1"
-            cmd2 = "show client_min_messages"
+            cmd = "show client_min_messages"
 
             # change client_min_messages and save old value
-            cmm_old = node.execute(dbname='postgres', query=cmd2)
-            node.safe_psql(dbname='postgres', query=cmd1)
+            cmm_old = node.execute(dbname='postgres', query=cmd)
+            node.append_conf('postgresql.conf', 'client_min_messages = DEBUG1')
 
             # reload config
             node.reload()
 
             # check new value
-            cmm_new = node.execute(dbname='postgres', query=cmd2)
+            cmm_new = node.execute(dbname='postgres', query=cmd)
             self.assertEqual('debug1', cmm_new[0][0].lower())
             self.assertNotEqual(cmm_old, cmm_new)