move cached_initdb() to a dedicated module

Author: funbringer

MANIFEST

@@ -4,6 +4,7 @@ setup.py
 testgres/__init__.py
 testgres/api.py
 testgres/backup.py
+testgres/cache.py
 testgres/config.py
 testgres/connection.py
 testgres/consts.py

run_tests.sh

@@ -13,7 +13,7 @@ else
 fi
 
 
-# check that pg_config exists
+echo check that pg_config exists
 command -v pg_config
 
 

testgres/cache.py

@@ -0,0 +1,60 @@
+# coding: utf-8
+
+import atexit
+import os
+import shutil
+import tempfile
+
+from .config import TestgresConfig
+
+from .exceptions import \
+    InitNodeException, \
+    ExecUtilException
+
+from .utils import \
+    get_bin_path, \
+    execute_utility as _execute_utility, \
+    explain_exception as _explain_exception
+
+
+def cached_initdb(data_dir, initdb_logfile, initdb_params=[]):
+    """
+    Perform initdb or use cached node files.
+    """
+
+    def call_initdb(initdb_dir):
+        try:
+            _params = [get_bin_path("initdb"), "-D", initdb_dir, "-N"]
+            _execute_utility(_params + initdb_params, initdb_logfile)
+        except ExecUtilException as e:
+            raise InitNodeException(_explain_exception(e))
+
+    def rm_cached_data_dir(cached_data_dir):
+        shutil.rmtree(cached_data_dir, ignore_errors=True)
+
+    # Call initdb if we have custom params or shouldn't cache it
+    if initdb_params or not TestgresConfig.cache_initdb:
+        call_initdb(data_dir)
+    else:
+        # Set default temp dir for cached initdb
+        if TestgresConfig.cached_initdb_dir is None:
+
+            # Create default temp dir
+            TestgresConfig.cached_initdb_dir = tempfile.mkdtemp()
+
+            # Schedule cleanup
+            atexit.register(rm_cached_data_dir,
+                            TestgresConfig.cached_initdb_dir)
+
+        # Fetch cached initdb dir
+        cached_data_dir = TestgresConfig.cached_initdb_dir
+
+        # Initialize cached initdb
+        if not os.listdir(cached_data_dir):
+            call_initdb(cached_data_dir)
+
+        try:
+            # Copy cached initdb to current data dir
+            shutil.copytree(cached_data_dir, data_dir)
+        except Exception as e:
+            raise InitNodeException(_explain_exception(e))

testgres/node.py

@@ -1,6 +1,5 @@
 # coding: utf-8
 
-import atexit
 import io
 import os
 import shutil
@@ -10,6 +9,8 @@
 
 from enum import Enum
 
+from .cache import cached_initdb as _cached_initdb
+
 from .config import TestgresConfig
 
 from .connection import \
@@ -27,7 +28,6 @@
 from .exceptions import \
     CatchUpException,   \
     ExecUtilException,  \
-    InitNodeException,  \
     QueryException,     \
     StartNodeException, \
     TimeoutException
@@ -875,47 +875,3 @@ def connect(self, dbname='postgres', username=None):
 
         return NodeConnection(
             parent_node=self, dbname=dbname, username=username)
-
-
-def _cached_initdb(data_dir, initdb_logfile, initdb_params=[]):
-    """
-    Perform initdb or use cached node files.
-    """
-
-    def call_initdb(_data_dir):
-        try:
-            _params = [get_bin_path("initdb"), "-D", _data_dir, "-N"]
-            _execute_utility(_params + initdb_params, initdb_logfile)
-        except ExecUtilException as e:
-            raise InitNodeException(_explain_exception(e))
-
-    # Call initdb if we have custom params
-    if initdb_params or not TestgresConfig.cache_initdb:
-        call_initdb(data_dir)
-    # Else we can use cached dir
-    else:
-        # Set default temp dir for cached initdb
-        if TestgresConfig.cached_initdb_dir is None:
-
-            def rm_cached_data_dir(rm_dir):
-                shutil.rmtree(rm_dir, ignore_errors=True)
-
-            # Create default temp dir
-            TestgresConfig.cached_initdb_dir = tempfile.mkdtemp()
-
-            # Schedule cleanup
-            atexit.register(rm_cached_data_dir,
-                            TestgresConfig.cached_initdb_dir)
-
-        # Fetch cached initdb dir
-        cached_data_dir = TestgresConfig.cached_initdb_dir
-
-        # Initialize cached initdb
-        if not os.listdir(cached_data_dir):
-            call_initdb(cached_data_dir)
-
-        try:
-            # Copy cached initdb to current data dir
-            shutil.copytree(cached_data_dir, data_dir)
-        except Exception as e:
-            raise InitNodeException(_explain_exception(e))