testgres 1.12.0__tar.gz → 1.12.2__tar.gz

{testgres-1.12.0/testgres.egg-info → testgres-1.12.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testgres
-Version: 1.12.0
+Version: 1.12.2
 Summary: Testing utility for PostgreSQL and its extensions
 Home-page: https://github.com/postgrespro/testgres
 Author: Postgres Professional
@@ -14,7 +14,7 @@ Requires-Dist: port-for>=0.4
 Requires-Dist: six>=1.9.0
 Requires-Dist: psutil
 Requires-Dist: packaging
-Requires-Dist: testgres.os_ops<1.0.0,>=0.0.2
+Requires-Dist: testgres.os_ops<2.0.0,>=1.0.0
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{testgres-1.12.0 → testgres-1.12.2}/setup.py

@@ -12,7 +12,7 @@ install_requires = [
     "six>=1.9.0",
     "psutil",
     "packaging",
-    "testgres.os_ops>=0.0.2,<1.0.0"
+    "testgres.os_ops>=1.0.0,<2.0.0"
 ]
 
 # Add compatibility enum class
@@ -28,7 +28,7 @@ with open('README.md', 'r') as f:
     readme = f.read()
 
 setup(
-    version='1.12.0',
+    version='1.12.2',
     name='testgres',
     packages=['testgres', 'testgres.impl'],
     package_dir={"testgres": "src"},

{testgres-1.12.0 → testgres-1.12.2}/src/node.py

@@ -669,7 +669,7 @@ class PostgresNode(object):
 
         try:
             eprint('Force stopping node {0} with PID {1}'.format(self.name, node_pid))
-            self.os_ops.kill(node_pid, signal.SIGKILL, expect_error=False)
+            self.os_ops.kill(node_pid, signal.SIGKILL)
         except Exception:
             # The node has already stopped
             pass
@@ -1206,11 +1206,12 @@ class PostgresNode(object):
                          If None, the main PostgreSQL node process will be killed. Defaults to None.
             """
         if self.is_started:
+            assert isinstance(self._os_ops, OsOperations)
             sig = signal.SIGKILL if os.name != 'nt' else signal.SIGBREAK
             if someone is None:
-                os.kill(self.pid, sig)
+                self._os_ops.kill(self.pid, sig)
             else:
-                os.kill(self.auxiliary_pids[someone][0], sig)
+                self._os_ops.kill(self.auxiliary_pids[someone][0], sig)
             self.is_started = False
 
     def restart(self, params=[]):
@@ -2119,10 +2120,11 @@ class PostgresNode(object):
         Args:
             old_node: An instance of PostgresNode representing the old node.
         """
-        if not os.path.exists(old_node.data_dir):
+        assert isinstance(self._os_ops, OsOperations)
+        if not self._os_ops.path_exists(old_node.data_dir):
             raise Exception("Old node must be initialized")
 
-        if not os.path.exists(self.data_dir):
+        if not self._os_ops.path_exists(self.data_dir):
             self.init()
 
         if not options:
@@ -2130,7 +2132,7 @@ class PostgresNode(object):
 
         pg_upgrade_binary = self._get_bin_path("pg_upgrade")
 
-        if not os.path.exists(pg_upgrade_binary):
+        if not self._os_ops.path_exists(pg_upgrade_binary):
             raise Exception("pg_upgrade does not exist in the new node's binary path")
 
         upgrade_command = [

{testgres-1.12.0 → testgres-1.12.2/testgres.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testgres
-Version: 1.12.0
+Version: 1.12.2
 Summary: Testing utility for PostgreSQL and its extensions
 Home-page: https://github.com/postgrespro/testgres
 Author: Postgres Professional
@@ -14,7 +14,7 @@ Requires-Dist: port-for>=0.4
 Requires-Dist: six>=1.9.0
 Requires-Dist: psutil
 Requires-Dist: packaging
-Requires-Dist: testgres.os_ops<1.0.0,>=0.0.2
+Requires-Dist: testgres.os_ops<2.0.0,>=1.0.0
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{testgres-1.12.0 → testgres-1.12.2}/testgres.egg-info/requires.txt

@@ -3,4 +3,4 @@ port-for>=0.4
 six>=1.9.0
 psutil
 packaging
-testgres.os_ops<1.0.0,>=0.0.2
+testgres.os_ops<2.0.0,>=1.0.0

{testgres-1.12.0 → testgres-1.12.2}/tests/test_os_ops_common.py

@@ -5,6 +5,7 @@ from .helpers.global_data import OsOperations
 from .helpers.run_conditions import RunConditions
 
 import os
+import sys
 
 import pytest
 import re
@@ -14,6 +15,10 @@ import socket
 import threading
 import typing
 import uuid
+import subprocess
+import psutil
+import time
+import signal as os_signal
 
 from src import InvalidOperationException
 from src import ExecUtilException
@@ -1137,3 +1142,197 @@ class TestOsOpsCommon:
 
         logging.info("Test is finished! Total error count is {}.".format(nErrors))
         return
+
+    T_KILL_SIGNAL_DESCR = typing.Tuple[
+        str,
+        typing.Union[int, os_signal.Signals],
+        str
+    ]
+
+    sm_kill_signal_ids: typing.List[T_KILL_SIGNAL_DESCR] = [
+        ("SIGINT", os_signal.SIGINT, "2"),
+        # ("SIGQUIT", os_signal.SIGQUIT, "3"), # it creates coredump
+        ("SIGKILL", os_signal.SIGKILL, "9"),
+        ("SIGTERM", os_signal.SIGTERM, "15"),
+        ("2", 2, "2"),
+        # ("3", 3, "3"), # it creates coredump
+        ("9", 9, "9"),
+        ("15", 15, "15"),
+    ]
+
+    @pytest.fixture(
+        params=sm_kill_signal_ids,
+        ids=["signal: {}".format(x[0]) for x in sm_kill_signal_ids],
+    )
+    def kill_signal_id(self, request: pytest.FixtureRequest) -> T_KILL_SIGNAL_DESCR:
+        assert isinstance(request, pytest.FixtureRequest)
+        assert type(request.param) == tuple  # noqa: E721
+        return request.param
+
+    def test_kill_signal(
+        self,
+        kill_signal_id: T_KILL_SIGNAL_DESCR,
+    ):
+        assert type(kill_signal_id) == tuple  # noqa: E721
+        assert "{}".format(kill_signal_id[1]) == kill_signal_id[2]
+        assert "{}".format(int(kill_signal_id[1])) == kill_signal_id[2]
+
+    def test_kill(
+        self,
+        os_ops: OsOperations,
+        kill_signal_id: T_KILL_SIGNAL_DESCR,
+    ):
+        """
+        Test listdir for listing directory contents.
+        """
+        assert isinstance(os_ops, OsOperations)
+        assert type(kill_signal_id) == tuple  # noqa: E721
+
+        cmd = [
+            sys.executable,
+            "-c",
+            "import time; print('ENTER');time.sleep(300);print('EXIT')"
+        ]
+
+        logging.info("Local test process is creating ...")
+        proc = subprocess.Popen(
+            cmd,
+            text=True,
+        )
+
+        assert proc is not None
+        assert type(proc) == subprocess.Popen  # noqa: E721
+        proc_pid = proc.pid
+        assert type(proc_pid) == int  # noqa: E721
+        logging.info("Test process pid is {}".format(proc_pid))
+
+        logging.info("Get this test process ...")
+        p1 = psutil.Process(proc_pid)
+        assert p1 is not None
+        del p1
+
+        logging.info("Kill this test process ...")
+        os_ops.kill(proc_pid, kill_signal_id[1])
+
+        logging.info("Wait for finish ...")
+        proc.wait()
+
+        logging.info("Try to get this test process ...")
+
+        attempt = 0
+        while True:
+            if attempt == 20:
+                raise RuntimeError("Process did not die.")
+
+            attempt += 1
+
+            if attempt > 1:
+                logging.info("Sleep 1 seconds...")
+                time.sleep(1)
+
+            try:
+                psutil.Process(proc_pid)
+            except psutil.ZombieProcess as e:
+                logging.info("Exception {}: {}".format(
+                    type(e).__name__,
+                    str(e),
+                ))
+            except psutil.NoSuchProcess:
+                logging.info("OK. Process died.")
+                break
+
+            logging.info("Process is alive!")
+            continue
+
+        return
+
+    def test_kill__unk_pid(
+        self,
+        os_ops: OsOperations,
+        kill_signal_id: T_KILL_SIGNAL_DESCR,
+    ):
+        """
+        Test listdir for listing directory contents.
+        """
+        assert isinstance(os_ops, OsOperations)
+        assert type(kill_signal_id) == tuple  # noqa: E721
+
+        cmd = [
+            sys.executable,
+            "-c",
+            "import sys; print(\"a\", file=sys.stdout); print(\"b\", file=sys.stderr)"
+        ]
+
+        logging.info("Local test process is creating ...")
+        proc = subprocess.Popen(
+            cmd,
+            text=True,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+        )
+
+        assert proc is not None
+        assert type(proc) == subprocess.Popen  # noqa: E721
+        proc_pid = proc.pid
+        assert type(proc_pid) == int  # noqa: E721
+        logging.info("Test process pid is {}".format(proc_pid))
+
+        logging.info("Wait for finish ...")
+        pout, perr = proc.communicate()
+        logging.info("STDOUT: {}".format(pout))
+        logging.info("STDERR: {}".format(pout))
+        assert type(pout) == str  # noqa: E721
+        assert type(perr) == str  # noqa: E721
+        assert pout == "a\n"
+        assert perr == "b\n"
+        assert type(proc.returncode) == int  # noqa: E721
+        assert proc.returncode == 0
+
+        logging.info("Try to get this test process ...")
+
+        attempt = 0
+        while True:
+            if attempt == 20:
+                raise RuntimeError("Process did not die.")
+
+            attempt += 1
+
+            if attempt > 1:
+                logging.info("Sleep 1 seconds...")
+                time.sleep(1)
+
+            try:
+                psutil.Process(proc_pid)
+            except psutil.ZombieProcess as e:
+                logging.info("Exception {}: {}".format(
+                    type(e).__name__,
+                    str(e),
+                ))
+            except psutil.NoSuchProcess:
+                logging.info("OK. Process died.")
+                break
+
+            logging.info("Process is alive!")
+            continue
+
+        # --------------------
+        with pytest.raises(expected_exception=Exception) as x:
+            os_ops.kill(proc_pid, kill_signal_id[1])
+
+        assert x is not None
+        assert isinstance(x.value, Exception)
+        assert not isinstance(x.value, AssertionError)
+
+        logging.info("Our error is [{}]".format(str(x.value)))
+        logging.info("Our exception has type [{}]".format(type(x.value).__name__))
+
+        if type(os_ops).__name__ == "LocalOsOperations":
+            assert type(x.value) == ProcessLookupError  # noqa: E721
+            assert "No such process" in str(x.value)
+        elif type(os_ops).__name__ == "RemoteOsOperations":
+            assert type(x.value) == ExecUtilException  # noqa: E721
+            assert "No such process" in str(x.value)
+        else:
+            RuntimeError("Unknown os_ops type: {}".format(type(os_ops).__name__))
+
+        return