Feb 17, 2025 · Feb 17, 2025 · Feb 17, 2025
diff --git a/testgres/node.py b/testgres/node.py
 import subprocess
 import threading
 import tempfile
 import platform
 from queue import Queue

 import time

        # Define delayed propertyes
        if not ("unix_socket_directories" in options.keys()):
            options["unix_socket_directories"] = __class__._gettempdir()
            options["unix_socket_directories"] = __class__._gettempdir_for_socket()

        # Set config values
        node.set_auto_conf(options)

        return node

    def _gettempdir_for_socket():
        platform_system_name = platform.system().lower()

        if platform_system_name == "windows":
            return __class__._gettempdir()

        #
        # [2025-02-17] Hot fix.
        #
        # Let's use hard coded path as Postgres likes.
        #
        # pg_config_manual.h:
        #
        # #ifndef WIN32
        # #define DEFAULT_PGSOCKET_DIR  "/tmp"
        # #else
        # #define DEFAULT_PGSOCKET_DIR ""
        # #endif
        #
        # On the altlinux-10 tempfile.gettempdir() may return
        # the path to "private" temp directiry - "/temp/.private/<username>/"
        #
        # But Postgres want to find a socket file in "/tmp" (see above).
        #

        return "/tmp"

    def _gettempdir():
        v = tempfile.gettempdir()

diff --git a/tests/test_simple.py b/tests/test_simple.py
        correct_bin_dir = app.make_simple(base_dir=node.base_dir, bin_dir=bin_dir)
        correct_bin_dir.slow_start()
        correct_bin_dir.safe_psql("SELECT 1;")
        correct_bin_dir.stop()

        while True:
            try:
                app.make_simple(base_dir=node.base_dir, bin_dir="wrong/path")
            except FileNotFoundError:
                break  # Expected error
            except ExecUtilException:
                break  # Expected error

        try:
            wrong_bin_dir = app.make_empty(base_dir=node.base_dir, bin_dir="wrong/path")
            wrong_bin_dir.slow_start()
            raise RuntimeError("Error was expected.")  # We should not reach this
        except FileNotFoundError:
    pass  # Expected error

 return

    def test_set_auto_conf(self):
        # elements contain [property id, value, storage value]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,6 +6,7 @@
		import subprocess
		import threading
		import tempfile
		import platform
		from queue import Queue

		import time
Expand DownExpand Up		@@ -1925,7 +1926,7 @@ def make_simple(

		# Define delayed propertyes
		if not ("unix_socket_directories" in options.keys()):
		options["unix_socket_directories"] = __class__._gettempdir()
		options["unix_socket_directories"] = __class__._gettempdir_for_socket()

		# Set config values
		node.set_auto_conf(options)
Expand All		@@ -1938,6 +1939,33 @@ def make_simple(

		return node

		def _gettempdir_for_socket():
		platform_system_name = platform.system().lower()

		if platform_system_name == "windows":
		return __class__._gettempdir()

		#
		# [2025-02-17] Hot fix.
		#
		# Let's use hard coded path as Postgres likes.
		#
		# pg_config_manual.h:
		#
		# #ifndef WIN32
		# #define DEFAULT_PGSOCKET_DIR "/tmp"
		# #else
		# #define DEFAULT_PGSOCKET_DIR ""
		# #endif
		#
		# On the altlinux-10 tempfile.gettempdir() may return
		# the path to "private" temp directiry - "/temp/.private/<username>/"
		#
		# But Postgres want to find a socket file in "/tmp" (see above).
		#

		return "/tmp"

		def _gettempdir():
		v = tempfile.gettempdir()

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1244,13 +1244,19 @@ def test_simple_with_bin_dir(self):
		correct_bin_dir = app.make_simple(base_dir=node.base_dir, bin_dir=bin_dir)
		correct_bin_dir.slow_start()
		correct_bin_dir.safe_psql("SELECT 1;")
		correct_bin_dir.stop()

		while True:
		try:
		app.make_simple(base_dir=node.base_dir, bin_dir="wrong/path")
		except FileNotFoundError:
		break # Expected error
		except ExecUtilException:
		break # Expected error

		try:
		wrong_bin_dir = app.make_empty(base_dir=node.base_dir, bin_dir="wrong/path")
		wrong_bin_dir.slow_start()
		raise RuntimeError("Error was expected.") # We should not reach this
		except FileNotFoundError:
		pass # Expected error

		return

		def test_set_auto_conf(self):
		# elements contain [property id, value, storage value]
Expand Down