X-Git-Url: http://www.average.org/gitweb/?a=blobdiff_plain;f=test%2Fcommon.py;h=a31ff094d9d806ebfa5b1572d49587a2a20c7bd8;hb=HEAD;hp=7a863106309e61072511641a7a975f5e344abbdf;hpb=ea3dc3f2096472d502d376e13050a59f97efd4a8;p=loctrkd.git diff --git a/test/common.py b/test/common.py index 7a86310..17446a5 100644 --- a/test/common.py +++ b/test/common.py @@ -4,23 +4,27 @@ from configparser import ConfigParser, SectionProxy from contextlib import closing, ExitStack from http.server import HTTPServer, SimpleHTTPRequestHandler from importlib import import_module -from logging import DEBUG, StreamHandler +from logging import DEBUG, StreamHandler, WARNING from multiprocessing import Process from os import kill, unlink from signal import SIGINT from socket import ( + AF_INET, AF_INET6, + getaddrinfo, MSG_DONTWAIT, SOCK_DGRAM, + SOCK_STREAM, SOL_SOCKET, SO_REUSEADDR, socket, SocketType, ) from sys import exit, stderr +from random import Random from tempfile import mkstemp from time import sleep -from typing import Optional +from typing import Any, Optional from unittest import TestCase from loctrkd.common import init_protocols @@ -42,7 +46,7 @@ class TestWithServers(TestCase): _, self.tmpfilebase = mkstemp() self.conf = ConfigParser() self.conf["common"] = { - "protocols": "zx303proto", + "protocols": "zx303proto,beesure", } self.conf["collector"] = { "port": str(freeports[0]), @@ -75,6 +79,8 @@ class TestWithServers(TestCase): if verbose: cls.log.addHandler(StreamHandler(stderr)) cls.log.setLevel(DEBUG) + else: + cls.log.setLevel(WARNING) p = Process(target=cls.runserver, args=(self.conf,), kwargs=kwargs) p.start() self.children.append((srvname, p)) @@ -92,17 +98,17 @@ class TestWithServers(TestCase): p.start() self.children.append(("httpd", p)) sleep(1) + for srvname, p in self.children: + self.assertTrue( + p.is_alive(), + f"{srvname} did not start, exit code {p.exitcode}", + ) def tearDown(self) -> None: for srvname, p in self.children: if p.pid is not None: kill(p.pid, SIGINT) p.join() - self.assertEqual( - p.exitcode, - 0, - f"{srvname} terminated with return code {p.exitcode}", - ) for sfx in ( "", ".pub", @@ -115,6 +121,34 @@ class TestWithServers(TestCase): unlink(self.tmpfilebase + sfx) except OSError: pass + for srvname, p in self.children: + self.assertEqual( + p.exitcode, + 0, + f"{srvname} terminated with exit code {p.exitcode}", + ) + + +class Fuzz(TestWithServers): + def setUp(self, *args: str, **kwargs: Any) -> None: + super().setUp("collector") + self.rnd = Random() + for fam, typ, pro, cnm, skadr in getaddrinfo( + "127.0.0.1", + self.conf.getint("collector", "port"), + family=AF_INET, + type=SOCK_STREAM, + ): + break # Just take the first element + self.sock = socket(AF_INET, SOCK_STREAM) + self.sock.connect(skadr) + + def tearDown(self) -> None: + sleep(1) # give collector some time + send_and_drain(self.sock, None) + self.sock.close() + sleep(1) # Let the server close their side + super().tearDown() def send_and_drain(sock: SocketType, buf: Optional[bytes]) -> None: