rename gps303 -> loctrkd

[loctrkd.git] / test / common.py

diff --git a/test/common.py b/test/common.py
index b9f768c8f55d84573a9149f5de248f955039d32b..df430233adbff50eddca0ac7c7bb217292df3e0f 100644 (file)
--- a/test/common.py
+++ b/test/common.py
@@ -4,6 +4,7 @@ from configparser import ConfigParser, SectionProxy
 from contextlib import closing, ExitStack
 from http.server import HTTPServer, SimpleHTTPRequestHandler
 from importlib import import_module
 from contextlib import closing, ExitStack
 from http.server import HTTPServer, SimpleHTTPRequestHandler
 from importlib import import_module

+from logging import DEBUG, StreamHandler

 from multiprocessing import Process
 from os import kill, unlink
 from signal import SIGINT
 from multiprocessing import Process
 from os import kill, unlink
 from signal import SIGINT


@@ -16,7 +17,7 @@ from socket import (
     socket,
     SocketType,
 )
     socket,
     SocketType,
 )

-from sys import exit
+from sys import exit, stderr

 from tempfile import mkstemp
 from time import sleep
 from typing import Optional
 from tempfile import mkstemp
 from time import sleep
 from typing import Optional


@@ -26,7 +27,9 @@ NUMPORTS = 3
 
 
 class TestWithServers(TestCase):
 
 
 class TestWithServers(TestCase):

-    def setUp(self, *args: str, httpd: bool = False) -> None:
+    def setUp(
+        self, *args: str, httpd: bool = False, verbose: bool = False
+    ) -> None:

         freeports = []
         with ExitStack() as stack:
             for _ in range(NUMPORTS):
         freeports = []
         with ExitStack() as stack:
             for _ in range(NUMPORTS):


@@ -40,6 +43,7 @@ class TestWithServers(TestCase):
             "port": str(freeports[0]),
             "publishurl": "ipc://" + self.tmpfilebase + ".pub",
             "listenurl": "ipc://" + self.tmpfilebase + ".pul",
             "port": str(freeports[0]),
             "publishurl": "ipc://" + self.tmpfilebase + ".pub",
             "listenurl": "ipc://" + self.tmpfilebase + ".pul",

+            "protocols": "zx303proto",

         }
         self.conf["storage"] = {
             "dbfn": self.tmpfilebase + ".storage.sqlite",
         }
         self.conf["storage"] = {
             "dbfn": self.tmpfilebase + ".storage.sqlite",


@@ -60,14 +64,17 @@ class TestWithServers(TestCase):
                 kwargs = {"handle_hibernate": False}
             else:
                 kwargs = {}
                 kwargs = {"handle_hibernate": False}
             else:
                 kwargs = {}

-            cls = import_module("gps303." + srvname, package=".")
+            cls = import_module("loctrkd." + srvname, package=".")
+            if verbose:
+                cls.log.addHandler(StreamHandler(stderr))
+                cls.log.setLevel(DEBUG)

             p = Process(target=cls.runserver, args=(self.conf,), kwargs=kwargs)
             p.start()
             self.children.append((srvname, p))
         if httpd:
             server = HTTPServer(("", freeports[2]), SimpleHTTPRequestHandler)
 
             p = Process(target=cls.runserver, args=(self.conf,), kwargs=kwargs)
             p.start()
             self.children.append((srvname, p))
         if httpd:
             server = HTTPServer(("", freeports[2]), SimpleHTTPRequestHandler)
 

-            def run(server):
+            def run(server: HTTPServer) -> None:

                 try:
                     server.serve_forever()
                 except KeyboardInterrupt:
                 try:
                     server.serve_forever()
                 except KeyboardInterrupt:


@@ -87,7 +94,7 @@ class TestWithServers(TestCase):
             self.assertEqual(
                 p.exitcode,
                 0,
             self.assertEqual(
                 p.exitcode,
                 0,

-                srvname + " terminated with non-zero return code",
+                f"{srvname} terminated with return code {p.exitcode}",

             )
         for sfx in (
             "",
             )
         for sfx in (
             "",