Nov 1, 2024 · Nov 1, 2024 · Nov 18, 2024 · Nov 18, 2024 · Nov 18, 2024 · Nov 18, 2024
diff --git a/testgres/operations/os_ops.py b/testgres/operations/os_ops.py
    def get_process_children(self, pid):
        raise NotImplementedError()

    def _get_ssl_options(self):
        """
        Determine the SSL options based on available modules.
        """
        if self.conn_params.skip_ssl:
            if 'psycopg2' in sys.modules:
                return {"sslmode": "disable"}
            elif 'pg8000' in sys.modules:
                return {"ssl_context": None}
        return {}

    # Database control
    def db_connect(self, dbname, user, password=None, host="localhost", port=5432):
        ssl_options ={"sslmode": "disable"} ifself.conn_params.skip_ssl and 'psycopg2' in sys.modules else {}
        ssl_options = self._get_ssl_options()
        conn = pglib.connect(
            host=host,
            port=port,
            database=dbname,
            user=user,
            password=password,
            **({"ssl_context": None} if self.conn_params.skip_ssl and 'pg8000' in sys.modules elsessl_options)
            **ssl_options
        )

        return conn
diff --git a/tests/test_simple.py b/tests/test_simple.py
    def test_the_same_port(self):
        with get_new_node() as node:
            node.init().start()
        with get_new_node() as node2:
            node2.port = node.port
            node2.init().start()
            with get_new_node() as node2:
                node2.port = node.port
                # _should_free_port is true if port was set up manually
                node2._should_free_port = False
                node2.init().start()

    def test_make_simple_with_bin_dir(self):
        with get_new_node() as node:
Original file line number	Diff line number	Diff line change
Expand Up		@@ -124,16 +124,27 @@ def get_pid(self):
		def get_process_children(self, pid):
		raise NotImplementedError()

		def _get_ssl_options(self):
		"""
		Determine the SSL options based on available modules.
		"""
		if self.conn_params.skip_ssl:
		if 'psycopg2' in sys.modules:
		return {"sslmode": "disable"}
		elif 'pg8000' in sys.modules:
		return {"ssl_context": None}
		return {}

		# Database control
		def db_connect(self, dbname, user, password=None, host="localhost", port=5432):
		ssl_options ={"sslmode": "disable"} ifself.conn_params.skip_ssl and 'psycopg2' in sys.modules else {}
		ssl_options = self._get_ssl_options()
		conn = pglib.connect(
		host=host,
		port=port,
		database=dbname,
		user=user,
		password=password,
		**({"ssl_context": None} if self.conn_params.skip_ssl and 'pg8000' in sys.modules elsessl_options)
		**ssl_options
		)

		return conn
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1039,9 +1039,11 @@ def test_parse_pg_version(self):
		def test_the_same_port(self):
		with get_new_node() as node:
		node.init().start()
		with get_new_node() as node2:
		node2.port = node.port
		node2.init().start()
		with get_new_node() as node2:
		node2.port = node.port
		# _should_free_port is true if port was set up manually
		node2._should_free_port = False
		node2.init().start()

		def test_make_simple_with_bin_dir(self):
		with get_new_node() as node:
Expand Down