Apr 11, 2023 · Mar 23, 2023
diff --git a/testgres/enums.py b/testgres/enums.py
 from enum import Enum, IntEnum
 from six import iteritems
 from psutil import NoSuchProcess


 class XLogMethod(Enum):
            ],
        }  # yapf: disable

        try:
            cmdline = ''.join(process.cmdline())
        except (FileNotFoundError, ProcessLookupError, NoSuchProcess):
            return ProcessType.Unknown

        # we deliberately cut special words and spaces
        cmdline = ''.join(process.cmdline()) \
                    .replace('postgres:', '', 1) \
                    .replace('bgworker:', '', 1) \
                    .replace(' ', '')
        cmdline = cmdline.replace('postgres:', '', 1) \
            .replace('bgworker:', '', 1) \
            .replace(' ', '')

        for ptype in ProcessType:
            if cmdline.startswith(ptype.value.replace(' ', '')):
diff --git a/tests/test_simple.py b/tests/test_simple.py
 import time
 import six
 import unittest
 import psutil

 import logging.config

 # NOTE: those are ugly imports
 from testgres import bound_ports
 from testgres.utils import PgVer
 from testgres.node import ProcessProxy


 def pg_version_ge(version):
                with self.assertRaises(TestgresException):
                    replica.source_walsender

    def test_child_process_dies(self):
        # test for FileNotFound exception during child_processes() function
        with subprocess.Popen(["sleep", "60"]) as process:
            self.assertEqual(process.poll(), None)
            # collect list of processes currently running
            children = psutil.Process(os.getpid()).children()
            # kill a process, so received children dictionary becomes invalid
            process.kill()
            process.wait()
            # try to handle children list -- missing processes will have ptype "ProcessType.Unknown"
            [ProcessProxy(p) for p in children]


 if __name__ == '__main__':
    if os.environ.get('ALT_CONFIG'):
Original file line number	Diff line number	Diff line change
		@@ -1,5 +1,6 @@
		from enum import Enum, IntEnum
		from six import iteritems
		from psutil import NoSuchProcess


		class XLogMethod(Enum):
Expand DownExpand Up		@@ -68,11 +69,15 @@ def from_process(process):
		],
		} # yapf: disable

		try:
		cmdline = ''.join(process.cmdline())
		except (FileNotFoundError, ProcessLookupError, NoSuchProcess):
		return ProcessType.Unknown

		# we deliberately cut special words and spaces
		cmdline = ''.join(process.cmdline()) \
		.replace('postgres:', '', 1) \
		.replace('bgworker:', '', 1) \
		.replace(' ', '')
		cmdline = cmdline.replace('postgres:', '', 1) \
		.replace('bgworker:', '', 1) \
		.replace(' ', '')

		for ptype in ProcessType:
		if cmdline.startswith(ptype.value.replace(' ', '')):
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,6 +9,7 @@
		import time
		import six
		import unittest
		import psutil

		import logging.config

Expand DownExpand Up		@@ -48,6 +49,7 @@
		# NOTE: those are ugly imports
		from testgres import bound_ports
		from testgres.utils import PgVer
		from testgres.node import ProcessProxy


		def pg_version_ge(version):
Expand DownExpand Up		@@ -965,6 +967,18 @@ def test_child_pids(self):
		with self.assertRaises(TestgresException):
		replica.source_walsender

		def test_child_process_dies(self):
		# test for FileNotFound exception during child_processes() function
		with subprocess.Popen(["sleep", "60"]) as process:
		self.assertEqual(process.poll(), None)
		# collect list of processes currently running
		children = psutil.Process(os.getpid()).children()
		# kill a process, so received children dictionary becomes invalid
		process.kill()
		process.wait()
		# try to handle children list -- missing processes will have ptype "ProcessType.Unknown"
		[ProcessProxy(p) for p in children]


		if __name__ == '__main__':
		if os.environ.get('ALT_CONFIG'):
Expand Down