X-Git-Url: http://www.average.org/gitweb/?p=loctrkd.git;a=blobdiff_plain;f=test%2Fcommon.py;h=5f6c753fd0ae6f5863b29d41f1e76d489b8e865e;hp=dccecfc1bb9283c88740602c85c72cacb79306f9;hb=14683d91ed3172b416b1c3e5e59edd6528f30a69;hpb=f075dbd6eea0e7326d68fd15a103d668baf67c10

diff --git a/test/common.py b/test/common.py
index dccecfc..5f6c753 100644
--- a/test/common.py
+++ b/test/common.py
@@ -6,9 +6,18 @@ from importlib import import_module
 from multiprocessing import Process
 from os import kill, unlink
 from signal import SIGINT
-from socket import AF_INET6, SOCK_DGRAM, SOL_SOCKET, SO_REUSEADDR, socket
+from socket import (
+    AF_INET6,
+    MSG_DONTWAIT,
+    SOCK_DGRAM,
+    SOL_SOCKET,
+    SO_REUSEADDR,
+    socket,
+    SocketType,
+)
 from tempfile import mkstemp
 from time import sleep
+from typing import Optional
 from unittest import TestCase
 
 
@@ -43,6 +52,19 @@ class TestWithServers(TestCase):
             if p.pid is not None:
                 kill(p.pid, SIGINT)
             p.join()
-            print(srvname, "terminated with return code", p.exitcode)
+            self.assertEqual(
+                p.exitcode,
+                0,
+                srvname + " terminated with non-zero return code",
+            )
         for sfx in (".pub", ".pul"):
             unlink(self.tmpfilebase + sfx)
+
+
+def send_and_drain(sock: SocketType, buf: Optional[bytes]) -> None:
+    if buf is not None:
+        sock.send(buf)
+    try:
+        sock.recv(4096, MSG_DONTWAIT)
+    except BlockingIOError:
+        pass