testgres from PBCKP-152-multihost

v.shepard · v.shepard · commit 2bc17f0bd6e6 · 2023-06-07T00:42:29.000+02:00
Merge branch 'master' of https://github.com/postgrespro/testgres into PBCKP-152-multihost
diff --git a/setup.py b/setup.py
@@ -12,6 +12,8 @@
     "six>=1.9.0",
     "psutil",
     "packaging",
+    "paramiko",
+    "fabric"
 ]
 
 # Add compatibility enum class
diff --git a/testgres/api.py b/testgres/api.py
@@ -30,7 +30,6 @@
 PostgresNode(name='...', port=..., base_dir='...')
 [(3,)]
 """
-from defaults import default_username
 from .node import PostgresNode
 
 
diff --git a/testgres/backup.py b/testgres/backup.py
@@ -4,9 +4,7 @@
 
 from shutil import rmtree, copytree
 from six import raise_from
-from tempfile import mkdtemp
 
-from os_ops import OsOperations
 from .enums import XLogMethod
 
 from .consts import \
diff --git a/testgres/cache.py b/testgres/cache.py
@@ -1,12 +1,10 @@
 # coding: utf-8
 
-import io
 import os
 
-from shutil import copytree
 from six import raise_from
 
-from os_ops import OsOperations
+from .os_ops import OsOperations
 from .config import testgres_config
 
 from .consts import XLOG_CONTROL_FILE
diff --git a/testgres/connection.py b/testgres/connection.py
@@ -1,5 +1,4 @@
 # coding: utf-8
-from os_ops import OsOperations
 
 # we support both pg8000 and psycopg2
 try:
diff --git a/testgres/node.py b/testgres/node.py
@@ -12,7 +12,6 @@
 import subprocess
 import time
 
-from os_ops import OsOperations
 
 try:
     from collections.abc import Iterable
@@ -102,6 +101,7 @@
     clean_on_error
 
 from .backup import NodeBackup
+from .os_ops import OsOperations
 
 InternalError = pglib.InternalError
 ProgrammingError = pglib.ProgrammingError
@@ -1606,8 +1606,10 @@ def make_simple(
             set_replication=False,
             ptrack_enable=False,
             initdb_params=[],
-            pg_options={}):
-
+            pg_options={},
+            checksum=True):
+        if checksum and '--data-checksums' not in initdb_params:
+            initdb_params.append('--data-checksums')
         node = self.make_empty(base_dir)
         node.init(
             initdb_params=initdb_params, allow_streaming=set_replication)
diff --git a/testgres/os_ops.py b/testgres/os_ops.py
@@ -1,4 +1,3 @@
-import base64
 import getpass
 import os
 import shutil
@@ -15,7 +14,7 @@
     except ImportError:
         raise ImportError("You must have psycopg2 or pg8000 modules installed")
 
-from defaults import default_username
+from testgres.defaults import default_username
 from testgres.logger import log
 
 import paramiko

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@`
`12`	`12`	`"six>=1.9.0",`
`13`	`13`	`"psutil",`
`14`	`14`	`"packaging",`
	`15`	`+ "paramiko",`
	`16`	`+ "fabric"`
`15`	`17`	`]`
`16`	`18`
`17`	`19`	`# Add compatibility enum class`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`# coding: utf-8`
`2`		`-from os_ops import OsOperations`
`3`	`2`
`4`	`3`	`# we support both pg8000 and psycopg2`
`5`	`4`	`try:`