Nov 1, 2024 · Nov 1, 2024 · Nov 18, 2024 · Nov 18, 2024 · Nov 18, 2024 · Nov 18, 2024
diff --git a/testgres/node.py b/testgres/node.py
        if self.is_started:
            return self

        _params = [
                      self._get_bin_path("pg_ctl"),
                      "-D", self.data_dir,
                      "-l", self.pg_log_file,
                      "-w" if wait else '-W',  # --wait or --no-wait
                      "start"
                  ] + params  # yapf: disable
        _params = [self._get_bin_path("pg_ctl"),
                   "-D", self.data_dir,
                   "-l", self.pg_log_file,
                   "-w" if wait else '-W',  # --wait or --no-wait
                   "start"] + params  # yapf: disable

        max_retries = 5
        sleep_interval = 5  # seconds
diff --git a/testgres/operations/local_ops.py b/testgres/operations/local_ops.py
 import getpass
 import logging
 import os
 import shutil
 import psutil

 from ..exceptions import ExecUtilException
 from .os_ops import ConnectionParams, OsOperations,pglib,get_default_encoding
 from .os_ops import ConnectionParams, OsOperations, get_default_encoding

 try:
    from shutil import which as find_executable
diff --git a/testgres/operations/remote_ops.py b/testgres/operations/remote_ops.py
 import subprocess
 import tempfile

 # we support both pg8000 and psycopg2
 try:
    import psycopg2 as pglib
 except ImportError:
    try:
        import pg8000 as pglib
    except ImportError:
        raise ImportError("You must have psycopg2 or pg8000 modules installed")

 from ..exceptions import ExecUtilException
 from .os_ops import OsOperations, ConnectionParams, get_default_encoding
Original file line number	Diff line number	Diff line change
Expand Up		@@ -735,13 +735,11 @@ def start(self, params=None, wait: bool = True) -> 'PostgresNode':
		if self.is_started:
		return self

		_params = [
		self._get_bin_path("pg_ctl"),
		"-D", self.data_dir,
		"-l", self.pg_log_file,
		"-w" if wait else '-W', # --wait or --no-wait
		"start"
		] + params # yapf: disable
		_params = [self._get_bin_path("pg_ctl"),
		"-D", self.data_dir,
		"-l", self.pg_log_file,
		"-w" if wait else '-W', # --wait or --no-wait
		"start"] + params # yapf: disable

		max_retries = 5
		sleep_interval = 5 # seconds
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@
		import getpass
		import logging
		import os
		import shutil
Expand All		@@ -10,7 +9,7 @@
		import psutil

		from ..exceptions import ExecUtilException
		from .os_ops import ConnectionParams, OsOperations,pglib,get_default_encoding
		from .os_ops import ConnectionParams, OsOperations, get_default_encoding

		try:
		from shutil import which as find_executable
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,15 +4,6 @@
		import subprocess
		import tempfile

		# we support both pg8000 and psycopg2
		try:
		import psycopg2 as pglib
		except ImportError:
		try:
		import pg8000 as pglib
		except ImportError:
		raise ImportError("You must have psycopg2 or pg8000 modules installed")

		from ..exceptions import ExecUtilException
		from .os_ops import OsOperations, ConnectionParams, get_default_encoding

Expand Down