better cleanup testing, remove all unix sockets

3 files changed, 53 insertions, 8 deletions

diff --git a/kvmd/apps/cleanup/__init__.py b/kvmd/apps/cleanup/__init__.py
index 39bd7a71..632f258e 100644
--- a/kvmd/apps/cleanup/__init__.py
+++ b/kvmd/apps/cleanup/__init__.py
@@ -63,9 +63,15 @@ def main(argv: Optional[List[str]]=None) -> None:
     except subprocess.CalledProcessError:
         pass
 
-    unix_path = config.server.unix
-    if unix_path and os.path.exists(unix_path):
-        logger.info("Removing socket %r ...", unix_path)
-        os.remove(unix_path)
+    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:
+                logger.exception("Can't remove %s socket %r", owner, unix_path)
 
     logger.info("Bye-bye")
diff --git a/testenv/tox.ini b/testenv/tox.ini
index 937ca213..78742c76 100644
--- a/testenv/tox.ini
+++ b/testenv/tox.ini
@@ -28,7 +28,7 @@ deps =
 	-rrequirements.txt
 
 [testenv:vulture]
-commands = vulture --ignore-names=_format_P --ignore-decorators=@_exposed,@_system_task kvmd genmap.py tests testenv/linters/vulture-wl.py
+commands = vulture --ignore-names=_format_P --ignore-decorators=@_exposed,@_system_task,@pytest.fixture kvmd genmap.py tests testenv/linters/vulture-wl.py
 deps =
 	vulture
 	-rrequirements.txt
diff --git a/tests/test_app_cleanup.py b/tests/test_app_cleanup.py
index 8d9db421..d95d77de 100644
--- a/tests/test_app_cleanup.py
+++ b/tests/test_app_cleanup.py
@@ -20,15 +20,54 @@
 # ========================================================================== #
 
 
+import os
+import string
+import random
+import multiprocessing
+import multiprocessing.queues
+import time
+
+import setproctitle
+
 from kvmd.apps.cleanup import main
 
 
 # =====
-def test_main() -> None:
-    open("/tmp/foobar.sock", "w").close()
+def test_main(tmpdir) -> None:  # type: ignore
+    queue: multiprocessing.queues.Queue = multiprocessing.Queue()
+
+    ustreamer_fake_name = "ustr-" + "".join(
+        random.choice(string.ascii_lowercase + string.digits)
+        for _ in range(5)
+    )
+
+    ustreamer_sock_path = os.path.abspath(str(tmpdir.join("ustreamer-fake.sock")))
+    kvmd_sock_path = os.path.abspath(str(tmpdir.join("kvmd-fake.sock")))
+
+    def ustreamer_fake() -> None:
+        setproctitle.setproctitle(ustreamer_fake_name)
+        queue.put(True)
+        while True:
+            time.sleep(1)
+
+    proc = multiprocessing.Process(target=ustreamer_fake, daemon=True)
+    proc.start()
+    assert queue.get(timeout=5)
+
+    assert proc.is_alive()
     main([
         "kvmd-cleanup",
         "--set-options",
+        "kvmd/server/port=0",
+        "kvmd/server/unix=" + kvmd_sock_path,
         "kvmd/hid/device=/dev/null",
-        "kvmd/streamer/unix=/tmp/foobar.sock",
+        "kvmd/streamer/port=0",
+        "kvmd/streamer/unix=" + ustreamer_sock_path,
+        "kvmd/streamer/cmd=[\"%s\"]" % (ustreamer_fake_name),
     ])
+    assert not proc.is_alive()
+
+    assert not os.path.exists(ustreamer_sock_path)
+    assert not os.path.exists(kvmd_sock_path)
+
+    proc.join()