diff options
| -rw-r--r-- | kvmd/apps/cleanup/__init__.py | 27 | ||||
| -rw-r--r-- | testenv/tests/apps/cleanup/test_main.py | 19 |
2 files changed, 6 insertions, 40 deletions
diff --git a/kvmd/apps/cleanup/__init__.py b/kvmd/apps/cleanup/__init__.py index 5e83bd9a..83a9825e 100644 --- a/kvmd/apps/cleanup/__init__.py +++ b/kvmd/apps/cleanup/__init__.py @@ -20,7 +20,6 @@ # ========================================================================== # -import os import signal import time @@ -56,20 +55,6 @@ def _kill_streamer(config: Section) -> None: logger.exception("Can't send SIGKILL to streamer with pid=%d", proc.pid) -def _remove_sockets(config: Section) -> None: - logger = get_logger(0) - for (owner, unix_path) in [ - ("KVMD", config.server.unix), - ("streamer", config.streamer.unix), - ]: - if unix_path and os.path.exists(unix_path): - logger.info("Removing %s socket %r ...", owner, unix_path) - try: - os.remove(unix_path) - except Exception: # pragma: nocover - logger.exception("Can't remove %s socket %r", owner, unix_path) - - # ===== def main(argv: (list[str] | None)=None) -> None: config = init( @@ -82,13 +67,9 @@ def main(argv: (list[str] | None)=None) -> None: logger = get_logger(0) logger.info("Cleaning up ...") - for func in [ - _kill_streamer, - _remove_sockets, - ]: - try: - func(config) - except Exception: - pass + try: + _kill_streamer(config) + except Exception: + pass logger.info("Bye-bye") diff --git a/testenv/tests/apps/cleanup/test_main.py b/testenv/tests/apps/cleanup/test_main.py index 60f4b400..70581a2b 100644 --- a/testenv/tests/apps/cleanup/test_main.py +++ b/testenv/tests/apps/cleanup/test_main.py @@ -20,7 +20,6 @@ # ========================================================================== # -import os import multiprocessing import time @@ -32,15 +31,10 @@ from kvmd.apps.cleanup import main # ===== -def test_ok(tmpdir) -> None: # type: ignore +def test_ok() -> None: _ = Literal # Makes liters happy queue: "multiprocessing.Queue[Literal[True]]" = multiprocessing.Queue() - ustreamer_sock_path = os.path.abspath(str(tmpdir.join("ustreamer-fake.sock"))) - open(ustreamer_sock_path, "w").close() # pylint: disable=consider-using-with - kvmd_sock_path = os.path.abspath(str(tmpdir.join("kvmd-fake.sock"))) - open(kvmd_sock_path, "w").close() # pylint: disable=consider-using-with - def ustreamer_fake() -> None: setproctitle.setproctitle("kvmd/streamer: /usr/bin/ustreamer") queue.put(True) @@ -52,16 +46,7 @@ def test_ok(tmpdir) -> None: # type: ignore assert queue.get(timeout=5) assert proc.is_alive() - main([ - "kvmd-cleanup", - "--set-options", - f"kvmd/server/unix={kvmd_sock_path}", - f"kvmd/streamer/unix={ustreamer_sock_path}", - "--run", - ]) - - assert not os.path.exists(ustreamer_sock_path) - assert not os.path.exists(kvmd_sock_path) + main(["kvmd-cleanup", "--run"]) assert not proc.is_alive() proc.join() |