fix several incosistencies spotted by @Valeria1235

Author: funbringer

testgres/connection.py

@@ -17,7 +17,6 @@
     default_dbname, \
     default_username
 
-
 # export these exceptions
 InternalError = pglib.InternalError
 ProgrammingError = pglib.ProgrammingError

testgres/node.py

@@ -228,7 +228,7 @@ def _format_verbose_error(self, message=None):
     def init(self,
              fsync=False,
              unix_sockets=True,
-             allow_streaming=False,
+             allow_streaming=True,
              initdb_params=[]):
         """
         Perform initdb for this node.
@@ -401,7 +401,7 @@ def status(self):
 
     def get_pid(self):
         """
-        Return postmaster's pid if node is running, else 0.
+        Return postmaster's PID if node is running, else 0.
         """
 
         if self.status():
@@ -603,7 +603,7 @@ def cleanup(self, max_attempts=3):
 
         return self
 
-    @method_decorator(positional_args_hack(['query'], ['dbname', 'query']))
+    @method_decorator(positional_args_hack(['dbname', 'query']))
     def psql(self,
              query=None,
              filename=None,

testgres/utils.py

@@ -23,10 +23,9 @@
 
 def reserve_port():
     """
-    Generate a new port and add it to '_bound_ports'.
+    Generate a new port and add it to 'bound_ports'.
     """
 
-    global bound_ports
     port = port_for.select_random(exclude_ports=bound_ports)
     bound_ports.add(port)
 
@@ -38,7 +37,6 @@ def release_port(port):
     Free port provided by reserve_port().
     """
 
-    global bound_ports
     bound_ports.remove(port)
 
 
@@ -65,7 +63,7 @@ def generate_app_name():
     """
 
     import uuid
-    return ''.join(['testgres-', str(uuid.uuid4())])
+    return 'testgres-{}'.format(str(uuid.uuid4()))
 
 
 def execute_utility(args, logfile):
@@ -147,11 +145,7 @@ def get_pg_config():
     NOTE: this fuction caches the result by default (see TestgresConfig).
     """
 
-    global _pg_config_data
-
     def cache_pg_config_data(cmd):
-        global _pg_config_data
-
         # execute pg_config and get the output
         out = subprocess.check_output([cmd]).decode('utf-8')
 
@@ -161,16 +155,19 @@ def cache_pg_config_data(cmd):
                 key, _, value = line.partition('=')
                 data[key.strip()] = value.strip()
 
-        _pg_config_data.clear()
-
-        # cache data, if necessary
-        if TestgresConfig.cache_pg_config:
-            _pg_config_data = data
+        # cache data
+        global _pg_config_data
+        _pg_config_data = data
 
         return data
 
-    # return cached data, if allowed to
-    if TestgresConfig.cache_pg_config and _pg_config_data:
+    # drop cache if asked to
+    if not TestgresConfig.cache_pg_config:
+        global _pg_config_data
+        _pg_config_data = {}
+
+    # return cached data
+    if _pg_config_data:
         return _pg_config_data
 
     # try PG_CONFIG

tests/test_simple.py

@@ -38,16 +38,20 @@
 
 
 def util_is_executable(util):
-    exe_file = get_bin_path(util)
-
-    # check if util exists
-    if os.path.exists(exe_file):
+    def good_properties(f):
+        return (
+            os.path.exists(f) and
+            os.path.isfile(f) and
+            os.access(f, os.X_OK)
+        )
+
+    # try to resolve it
+    if good_properties(get_bin_path(util)):
         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):
+        if good_properties(os.path.join(path, util)):
             return True
 
 
@@ -519,19 +523,28 @@ def test_pgbench(self):
 
             self.assertTrue('tps' in out)
 
-    def test_config(self):
+    def test_pg_config(self):
         # set global if it wasn't set
-        configure_testgres(cache_initdb=True, cache_pg_config=True)
+        configure_testgres(cache_pg_config=True)
 
         # check same instances
         a = get_pg_config()
         b = get_pg_config()
         self.assertEqual(id(a), id(b))
 
+        # save right before config change
+        c1 = get_pg_config()
+
         # modify setting
         configure_testgres(cache_pg_config=False)
         self.assertFalse(TestgresConfig.cache_pg_config)
 
+        # save right after config change
+        c2 = get_pg_config()
+
+        # check different instances after config change
+        self.assertNotEqual(id(c1), id(c2))
+
         # check different instances
         a = get_pg_config()
         b = get_pg_config()