PBCKP-152 use black for formatting

Author: v.shepard

testgres/cache.py

@@ -4,8 +4,8 @@
 
 from six import raise_from
 
-from .op_ops.local_ops import LocalOperations
-from .op_ops.os_ops import OsOperations
+from .os_ops.local_ops import LocalOperations
+from .os_ops.os_ops import OsOperations
 from .config import testgres_config
 
 from .consts import XLOG_CONTROL_FILE
@@ -25,6 +25,7 @@ def cached_initdb(data_dir, logfile=None, params=None, os_ops: OsOperations = Lo
     """
     Perform initdb or use cached node files.
     """
+    testgres_config.os_ops = os_ops
 
     def call_initdb(initdb_dir, log=None):
         try:
@@ -60,7 +61,7 @@ def call_initdb(initdb_dir, log=None):
 
                 # XXX: build new WAL segment with our system id
                 _params = [get_bin_path("pg_resetwal"), "-D", data_dir, "-f"]
-                execute_utility(_params, logfile, os_ops)
+                execute_utility(_params, logfile, os_ops=os_ops)
 
         except ExecUtilException as e:
             msg = "Failed to reset WAL for system id"

testgres/config.py

@@ -5,9 +5,8 @@
 import tempfile
 
 from contextlib import contextmanager
-from shutil import rmtree
 
-from .op_ops.local_ops import LocalOperations
+from .os_ops.local_ops import LocalOperations
 from .consts import TMP_CACHE
 
 
@@ -44,7 +43,7 @@ class GlobalConfig(object):
     _cached_initdb_dir = None
     """ underlying class attribute for cached_initdb_dir property """
 
-    os_ops = None
+    os_ops = LocalOperations()
     """ OsOperation object that allows work on remote host """
     @property
     def cached_initdb_dir(self):
@@ -137,9 +136,9 @@ def copy(self):
 
 
 @atexit.register
-def _rm_cached_initdb_dirs(os_ops=LocalOperations()):
+def _rm_cached_initdb_dirs():
     for d in cached_initdb_dirs:
-        os_ops.rmdirs(d, ignore_errors=True)
+        testgres_config.os_ops.rmdirs(d, ignore_errors=True)
 
 
 def push_config(**options):

testgres/defaults.py

@@ -1,9 +1,8 @@
 import datetime
-import os
 import struct
 import uuid
 
-from .op_ops.local_ops import LocalOperations
+from .os_ops.local_ops import LocalOperations
 
 
 def default_dbname():

testgres/node.py

@@ -1,20 +1,16 @@
 # coding: utf-8
 
-import io
 import os
 import random
-import shutil
 import signal
 import threading
 from queue import Queue
 
 import psutil
-import subprocess
 import time
 
-from op_ops.local_ops import LocalOperations
-from op_ops.os_ops import OsOperations
-from op_ops.remote_ops import RemoteOperations
+from .os_ops.local_ops import LocalOperations
+from .os_ops.remote_ops import RemoteOperations
 
 try:
     from collections.abc import Iterable
@@ -32,7 +28,6 @@
 
 from shutil import rmtree
 from six import raise_from, iteritems, text_type
-from tempfile import mkstemp, mkdtemp
 
 from .enums import \
     NodeStatus, \
@@ -96,7 +91,6 @@
     eprint, \
     get_bin_path, \
     get_pg_version, \
-    file_tail, \
     reserve_port, \
     release_port, \
     execute_utility, \
@@ -163,6 +157,7 @@ def __init__(self, name=None, port=None, base_dir=None,
         else:
             self.os_ops = RemoteOperations(host, hostname, ssh_key)
 
+        testgres_config.os_ops = self.os_ops
         # defaults for __exit__()
         self.cleanup_on_good_exit = testgres_config.node_cleanup_on_good_exit
         self.cleanup_on_bad_exit = testgres_config.node_cleanup_on_bad_exit
@@ -289,7 +284,7 @@ def base_dir(self):
             self._base_dir = self.os_ops.mkdtemp(prefix=TMP_NODE)
 
         # NOTE: it's safe to create a new dir
-        if not self.os_ops.exists(self._base_dir):
+        if not self.os_ops.path_exists(self._base_dir):
             self.os_ops.makedirs(self._base_dir)
 
         return self._base_dir
@@ -299,7 +294,7 @@ def logs_dir(self):
         path = os.path.join(self.base_dir, LOGS_DIR)
 
         # NOTE: it's safe to create a new dir
-        if not self.os_ops.exists(path):
+        if not self.os_ops.path_exists(path):
             self.os_ops.makedirs(path)
 
         return path
@@ -628,7 +623,7 @@ def status(self):
                 "-D", self.data_dir,
                 "status"
             ]  # yapf: disable
-            execute_utility(_params, self.utils_log_file)
+            execute_utility(_params, self.utils_log_file, os_ops=self.os_ops)
             return NodeStatus.Running
 
         except ExecUtilException as e:
@@ -650,7 +645,7 @@ def get_control_data(self):
         _params += ["-D"] if self._pg_version >= PgVer('9.5') else []
         _params += [self.data_dir]
 
-        data = execute_utility(_params, self.utils_log_file)
+        data = execute_utility(_params, self.utils_log_file, os_ops=self.os_ops)
 
         out_dict = {}
 
@@ -713,7 +708,7 @@ def start(self, params=[], wait=True):
         ] + params  # yapf: disable
 
         try:
-            execute_utility(_params, self.utils_log_file)
+            execute_utility(_params, self.utils_log_file, os_ops=self.os_ops)
         except ExecUtilException as e:
             msg = 'Cannot start node'
             files = self._collect_special_files()
@@ -744,7 +739,7 @@ def stop(self, params=[], wait=True):
             "stop"
         ] + params  # yapf: disable
 
-        execute_utility(_params, self.utils_log_file)
+        execute_utility(_params, self.utils_log_file, os_ops=self.os_ops)
 
         self._maybe_stop_logger()
         self.is_started = False
@@ -786,7 +781,7 @@ def restart(self, params=[]):
         ] + params  # yapf: disable
 
         try:
-            execute_utility(_params, self.utils_log_file)
+            execute_utility(_params, self.utils_log_file, os_ops=self.os_ops)
         except ExecUtilException as e:
             msg = 'Cannot restart node'
             files = self._collect_special_files()
@@ -813,7 +808,7 @@ def reload(self, params=[]):
             "reload"
         ] + params  # yapf: disable
 
-        execute_utility(_params, self.utils_log_file)
+        execute_utility(_params, self.utils_log_file, os_ops=self.os_ops)
 
         return self
 
@@ -835,7 +830,7 @@ def promote(self, dbname=None, username=None):
             "promote"
         ]  # yapf: disable
 
-        execute_utility(_params, self.utils_log_file)
+        execute_utility(_params, self.utils_log_file, os_ops=self.os_ops)
 
         # for versions below 10 `promote` is asynchronous so we need to wait
         # until it actually becomes writable
@@ -870,7 +865,7 @@ def pg_ctl(self, params):
             "-w"  # wait
         ] + params  # yapf: disable
 
-        return execute_utility(_params, self.utils_log_file)
+        return execute_utility(_params, self.utils_log_file, os_ops=self.os_ops)
 
     def free_port(self):
         """
@@ -1035,10 +1030,9 @@ def dump(self,
         # Generate tmpfile or tmpdir
         def tmpfile():
             if format == DumpFormat.Directory:
-                fname = mkdtemp(prefix=TMP_DUMP)
+                fname = self.os_ops.mkdtemp(prefix=TMP_DUMP)
             else:
-                fd, fname = mkstemp(prefix=TMP_DUMP)
-                os.close(fd)
+                fname = self.os_ops.mkstemp(prefix=TMP_DUMP)
             return fname
 
         # Set default arguments
@@ -1056,7 +1050,7 @@ def tmpfile():
             "-F", format.value
         ]  # yapf: disable
 
-        execute_utility(_params, self.utils_log_file)
+        execute_utility(_params, self.utils_log_file, os_ops=self.os_ops)
 
         return filename
 
@@ -1085,7 +1079,7 @@ def restore(self, filename, dbname=None, username=None):
 
         # try pg_restore if dump is binary formate, and psql if not
         try:
-            execute_utility(_params, self.utils_log_name)
+            execute_utility(_params, self.utils_log_name, os_ops=self.os_ops)
         except ExecUtilException:
             self.psql(filename=filename, dbname=dbname, username=username)
 
@@ -1417,7 +1411,7 @@ def pgbench_run(self, dbname=None, username=None, options=[], **kwargs):
         # should be the last one
         _params.append(dbname)
 
-        return execute_utility(_params, self.utils_log_file)
+        return execute_utility(_params, self.utils_log_file, os_ops=self.os_ops)
 
     def connect(self,
                 dbname=None,